Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 1 | # lib/keystone |
| 2 | # Functions to control the configuration and operation of **Keystone** |
| 3 | |
| 4 | # Dependencies: |
| 5 | # ``functions`` file |
| 6 | # ``BASE_SQL_CONN`` |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 7 | # ``SERVICE_HOST``, ``SERVICE_PROTOCOL`` |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 8 | # ``SERVICE_TOKEN`` |
| 9 | # ``S3_SERVICE_PORT`` (template backend only) |
Attila Fazekas | 91b8d13 | 2013-01-06 22:40:09 +0100 | [diff] [blame] | 10 | # ``STACK_USER`` |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 11 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 12 | # ``stack.sh`` calls the entry points in this order: |
| 13 | # |
| 14 | # install_keystone |
| 15 | # configure_keystone |
| 16 | # init_keystone |
| 17 | # start_keystone |
Dean Troyer | d835de8 | 2012-11-29 17:11:35 -0600 | [diff] [blame] | 18 | # create_keystone_accounts |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 19 | # stop_keystone |
| 20 | # cleanup_keystone |
| 21 | |
Dean Troyer | 7903b79 | 2012-09-13 17:16:12 -0500 | [diff] [blame] | 22 | # Save trace setting |
| 23 | XTRACE=$(set +o | grep xtrace) |
| 24 | set +o xtrace |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 25 | |
| 26 | |
| 27 | # Defaults |
| 28 | # -------- |
| 29 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 30 | # Set up default directories |
| 31 | KEYSTONE_DIR=$DEST/keystone |
| 32 | KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone} |
| 33 | KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 34 | KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone} |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 35 | |
| 36 | KEYSTONECLIENT_DIR=$DEST/python-keystoneclient |
| 37 | |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 38 | # Select the backend for Keystone's service catalog |
Dean Troyer | b80379c | 2012-09-10 18:30:37 -0500 | [diff] [blame] | 39 | KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 40 | KEYSTONE_CATALOG=$KEYSTONE_CONF_DIR/default_catalog.templates |
| 41 | |
Davanum Srinivas | 5bd96f9 | 2013-01-29 15:12:20 -0500 | [diff] [blame^] | 42 | # Select the backend for Tokens |
| 43 | KEYSTONE_TOKEN_BACKEND=${KEYSTONE_TOKEN_BACKEND:-sql} |
| 44 | |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 45 | # Select Keystone's token format |
| 46 | # Choose from 'UUID' and 'PKI' |
| 47 | KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI} |
| 48 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 49 | # Set Keystone interface configuration |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 50 | KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST} |
| 51 | KEYSTONE_AUTH_PORT=${KEYSTONE_AUTH_PORT:-35357} |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 52 | KEYSTONE_AUTH_PORT_INT=${KEYSTONE_AUTH_PORT_INT:-35358} |
| 53 | KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-$SERVICE_PROTOCOL} |
| 54 | |
| 55 | # Public facing bits |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 56 | KEYSTONE_SERVICE_HOST=${KEYSTONE_SERVICE_HOST:-$SERVICE_HOST} |
| 57 | KEYSTONE_SERVICE_PORT=${KEYSTONE_SERVICE_PORT:-5000} |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 58 | KEYSTONE_SERVICE_PORT_INT=${KEYSTONE_SERVICE_PORT_INT:-5001} |
| 59 | KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 60 | |
| 61 | |
| 62 | # Entry Points |
| 63 | # ------------ |
| 64 | |
| 65 | # cleanup_keystone() - Remove residual data files, anything left over from previous |
| 66 | # runs that a clean run would need to clean up |
| 67 | function cleanup_keystone() { |
| 68 | # kill instances (nova) |
| 69 | # delete image files (glance) |
| 70 | # This function intentionally left blank |
| 71 | : |
| 72 | } |
| 73 | |
| 74 | # configure_keystoneclient() - Set config files, create data dirs, etc |
| 75 | function configure_keystoneclient() { |
| 76 | setup_develop $KEYSTONECLIENT_DIR |
| 77 | } |
| 78 | |
| 79 | # configure_keystone() - Set config files, create data dirs, etc |
| 80 | function configure_keystone() { |
| 81 | setup_develop $KEYSTONE_DIR |
| 82 | |
| 83 | if [[ ! -d $KEYSTONE_CONF_DIR ]]; then |
| 84 | sudo mkdir -p $KEYSTONE_CONF_DIR |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 85 | fi |
Attila Fazekas | 91b8d13 | 2013-01-06 22:40:09 +0100 | [diff] [blame] | 86 | sudo chown $STACK_USER $KEYSTONE_CONF_DIR |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 87 | |
| 88 | if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then |
| 89 | cp -p $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF |
| 90 | cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR |
| 91 | fi |
| 92 | |
| 93 | # Rewrite stock ``keystone.conf`` |
Terry Wilson | 428af5a | 2012-11-01 16:12:39 -0400 | [diff] [blame] | 94 | local dburl |
| 95 | database_connection_url dburl keystone |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 96 | |
| 97 | if is_service_enabled tls-proxy; then |
| 98 | # Set the service ports for a proxy to take the originals |
| 99 | iniset $KEYSTONE_CONF DEFAULT public_port $KEYSTONE_SERVICE_PORT_INT |
| 100 | iniset $KEYSTONE_CONF DEFAULT admin_port $KEYSTONE_AUTH_PORT_INT |
| 101 | fi |
| 102 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 103 | iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" |
Doug Hellmann | 4de55e9 | 2012-10-26 12:24:28 -0400 | [diff] [blame] | 104 | iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT" |
Terry Wilson | 428af5a | 2012-11-01 16:12:39 -0400 | [diff] [blame] | 105 | iniset $KEYSTONE_CONF sql connection $dburl |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 106 | iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2" |
| 107 | sed -e " |
| 108 | /^pipeline.*ec2_extension crud_/s|ec2_extension crud_extension|ec2_extension s3_extension crud_extension|; |
| 109 | " -i $KEYSTONE_CONF |
| 110 | |
| 111 | # Append the S3 bits |
| 112 | iniset $KEYSTONE_CONF filter:s3_extension paste.filter_factory "keystone.contrib.s3:S3Extension.factory" |
| 113 | |
Davanum Srinivas | 5bd96f9 | 2013-01-29 15:12:20 -0500 | [diff] [blame^] | 114 | if [[ "$KEYSTONE_TOKEN_BACKEND" = "sql" ]]; then |
| 115 | iniset $KEYSTONE_CONF token driver keystone.token.backends.sql.Token |
| 116 | else |
| 117 | iniset $KEYSTONE_CONF token driver keystone.token.backends.kvs.Token |
| 118 | fi |
| 119 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 120 | if [[ "$KEYSTONE_CATALOG_BACKEND" = "sql" ]]; then |
| 121 | # Configure ``keystone.conf`` to use sql |
| 122 | iniset $KEYSTONE_CONF catalog driver keystone.catalog.backends.sql.Catalog |
| 123 | inicomment $KEYSTONE_CONF catalog template_file |
| 124 | else |
| 125 | cp -p $FILES/default_catalog.templates $KEYSTONE_CATALOG |
| 126 | |
| 127 | # Add swift endpoints to service catalog if swift is enabled |
| 128 | if is_service_enabled swift; then |
| 129 | echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
| 130 | echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/" >> $KEYSTONE_CATALOG |
| 131 | echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG |
| 132 | echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG |
| 133 | fi |
| 134 | |
| 135 | # Add quantum endpoints to service catalog if quantum is enabled |
| 136 | if is_service_enabled quantum; then |
| 137 | echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
| 138 | echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
| 139 | echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG |
| 140 | echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG |
| 141 | fi |
| 142 | |
Vincent Untz | 7e86dbe | 2012-12-13 08:50:37 +0100 | [diff] [blame] | 143 | sed -e " |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 144 | s,%SERVICE_HOST%,$SERVICE_HOST,g; |
| 145 | s,%S3_SERVICE_PORT%,$S3_SERVICE_PORT,g; |
| 146 | " -i $KEYSTONE_CATALOG |
| 147 | |
| 148 | # Configure ``keystone.conf`` to use templates |
| 149 | iniset $KEYSTONE_CONF catalog driver "keystone.catalog.backends.templated.TemplatedCatalog" |
| 150 | iniset $KEYSTONE_CONF catalog template_file "$KEYSTONE_CATALOG" |
| 151 | fi |
| 152 | |
| 153 | # Set up logging |
| 154 | LOGGING_ROOT="devel" |
| 155 | if [ "$SYSLOG" != "False" ]; then |
| 156 | LOGGING_ROOT="$LOGGING_ROOT,production" |
| 157 | fi |
| 158 | KEYSTONE_LOG_CONFIG="--log-config $KEYSTONE_CONF_DIR/logging.conf" |
| 159 | cp $KEYSTONE_DIR/etc/logging.conf.sample $KEYSTONE_CONF_DIR/logging.conf |
| 160 | iniset $KEYSTONE_CONF_DIR/logging.conf logger_root level "DEBUG" |
| 161 | iniset $KEYSTONE_CONF_DIR/logging.conf logger_root handlers "devel,production" |
| 162 | |
| 163 | } |
| 164 | |
Dean Troyer | d835de8 | 2012-11-29 17:11:35 -0600 | [diff] [blame] | 165 | # create_keystone_accounts() - Sets up common required keystone accounts |
| 166 | |
| 167 | # Tenant User Roles |
| 168 | # ------------------------------------------------------------------ |
| 169 | # service -- -- |
| 170 | # -- -- Member |
| 171 | # admin admin admin |
| 172 | # demo admin admin |
| 173 | # demo demo Member, anotherrole |
| 174 | # invisible_to_admin demo Member |
| 175 | |
| 176 | # Migrated from keystone_data.sh |
| 177 | create_keystone_accounts() { |
| 178 | |
| 179 | # admin |
| 180 | ADMIN_TENANT=$(keystone tenant-create \ |
| 181 | --name admin \ |
| 182 | | grep " id " | get_field 2) |
| 183 | ADMIN_USER=$(keystone user-create \ |
| 184 | --name admin \ |
| 185 | --pass "$ADMIN_PASSWORD" \ |
| 186 | --email admin@example.com \ |
| 187 | | grep " id " | get_field 2) |
| 188 | ADMIN_ROLE=$(keystone role-create \ |
| 189 | --name admin \ |
| 190 | | grep " id " | get_field 2) |
| 191 | keystone user-role-add \ |
| 192 | --user_id $ADMIN_USER \ |
| 193 | --role_id $ADMIN_ROLE \ |
| 194 | --tenant_id $ADMIN_TENANT |
| 195 | |
| 196 | # service |
| 197 | SERVICE_TENANT=$(keystone tenant-create \ |
| 198 | --name $SERVICE_TENANT_NAME \ |
| 199 | | grep " id " | get_field 2) |
| 200 | |
| 201 | # The Member role is used by Horizon and Swift so we need to keep it: |
| 202 | MEMBER_ROLE=$(keystone role-create --name=Member | grep " id " | get_field 2) |
| 203 | # ANOTHER_ROLE demonstrates that an arbitrary role may be created and used |
| 204 | # TODO(sleepsonthefloor): show how this can be used for rbac in the future! |
| 205 | ANOTHER_ROLE=$(keystone role-create --name=anotherrole | grep " id " | get_field 2) |
| 206 | |
| 207 | # invisible tenant - admin can't see this one |
| 208 | INVIS_TENANT=$(keystone tenant-create --name=invisible_to_admin | grep " id " | get_field 2) |
| 209 | |
| 210 | # demo |
| 211 | DEMO_TENANT=$(keystone tenant-create \ |
| 212 | --name=demo \ |
| 213 | | grep " id " | get_field 2) |
| 214 | DEMO_USER=$(keystone user-create \ |
| 215 | --name demo \ |
| 216 | --pass "$ADMIN_PASSWORD" \ |
| 217 | --email demo@example.com \ |
| 218 | | grep " id " | get_field 2) |
| 219 | keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $DEMO_TENANT |
| 220 | keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id $DEMO_TENANT |
| 221 | keystone user-role-add --user_id $DEMO_USER --role_id $ANOTHER_ROLE --tenant_id $DEMO_TENANT |
| 222 | keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $INVIS_TENANT |
| 223 | |
| 224 | # Keystone |
| 225 | if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
| 226 | KEYSTONE_SERVICE=$(keystone service-create \ |
| 227 | --name keystone \ |
| 228 | --type identity \ |
| 229 | --description "Keystone Identity Service" \ |
| 230 | | grep " id " | get_field 2) |
| 231 | keystone endpoint-create \ |
| 232 | --region RegionOne \ |
| 233 | --service_id $KEYSTONE_SERVICE \ |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 234 | --publicurl "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0" \ |
| 235 | --adminurl "$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0" \ |
| 236 | --internalurl "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0" |
Dean Troyer | d835de8 | 2012-11-29 17:11:35 -0600 | [diff] [blame] | 237 | fi |
| 238 | |
| 239 | # TODO(dtroyer): This is part of a series of changes...remove these when |
| 240 | # complete if they are really unused |
| 241 | # KEYSTONEADMIN_ROLE=$(keystone role-create \ |
| 242 | # --name KeystoneAdmin \ |
| 243 | # | grep " id " | get_field 2) |
| 244 | # KEYSTONESERVICE_ROLE=$(keystone role-create \ |
| 245 | # --name KeystoneServiceAdmin \ |
| 246 | # | grep " id " | get_field 2) |
| 247 | |
| 248 | # TODO(termie): these two might be dubious |
| 249 | # keystone user-role-add \ |
| 250 | # --user_id $ADMIN_USER \ |
| 251 | # --role_id $KEYSTONEADMIN_ROLE \ |
| 252 | # --tenant_id $ADMIN_TENANT |
| 253 | # keystone user-role-add \ |
| 254 | # --user_id $ADMIN_USER \ |
| 255 | # --role_id $KEYSTONESERVICE_ROLE \ |
| 256 | # --tenant_id $ADMIN_TENANT |
| 257 | } |
| 258 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 259 | # init_keystone() - Initialize databases, etc. |
| 260 | function init_keystone() { |
| 261 | # (Re)create keystone database |
Terry Wilson | 428af5a | 2012-11-01 16:12:39 -0400 | [diff] [blame] | 262 | recreate_database keystone utf8 |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 263 | |
| 264 | # Initialize keystone database |
| 265 | $KEYSTONE_DIR/bin/keystone-manage db_sync |
| 266 | |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 267 | if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then |
| 268 | # Set up certificates |
Vishvananda Ishaya | 23431f3 | 2012-12-12 15:57:33 -0800 | [diff] [blame] | 269 | rm -rf $KEYSTONE_CONF_DIR/ssl |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 270 | $KEYSTONE_DIR/bin/keystone-manage pki_setup |
| 271 | |
| 272 | # Create cache dir |
| 273 | sudo mkdir -p $KEYSTONE_AUTH_CACHE_DIR |
Attila Fazekas | 91b8d13 | 2013-01-06 22:40:09 +0100 | [diff] [blame] | 274 | sudo chown $STACK_USER $KEYSTONE_AUTH_CACHE_DIR |
Vishvananda Ishaya | 23431f3 | 2012-12-12 15:57:33 -0800 | [diff] [blame] | 275 | rm -f $KEYSTONE_AUTH_CACHE_DIR/* |
Dean Troyer | bc071bc | 2012-10-01 14:06:44 -0500 | [diff] [blame] | 276 | fi |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 277 | } |
| 278 | |
| 279 | # install_keystoneclient() - Collect source and prepare |
| 280 | function install_keystoneclient() { |
| 281 | git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH |
| 282 | } |
| 283 | |
| 284 | # install_keystone() - Collect source and prepare |
| 285 | function install_keystone() { |
| 286 | git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH |
| 287 | } |
| 288 | |
| 289 | # start_keystone() - Start running processes, including screen |
| 290 | function start_keystone() { |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 291 | # Get right service port for testing |
| 292 | local service_port=$KEYSTONE_SERVICE_PORT |
| 293 | if is_service_enabled tls-proxy; then |
| 294 | service_port=$KEYSTONE_SERVICE_PORT_INT |
| 295 | fi |
| 296 | |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 297 | # Start Keystone in a screen window |
| 298 | screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug" |
Dean Troyer | d835de8 | 2012-11-29 17:11:35 -0600 | [diff] [blame] | 299 | echo "Waiting for keystone to start..." |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 300 | if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= curl -s http://$SERVICE_HOST:$service_port/v2.0/ >/dev/null; do sleep 1; done"; then |
Dean Troyer | d835de8 | 2012-11-29 17:11:35 -0600 | [diff] [blame] | 301 | echo "keystone did not start" |
| 302 | exit 1 |
| 303 | fi |
Dean Troyer | c83a7e1 | 2012-11-29 11:47:58 -0600 | [diff] [blame] | 304 | |
| 305 | # Start proxies if enabled |
| 306 | if is_service_enabled tls-proxy; then |
| 307 | start_tls_proxy '*' $KEYSTONE_SERVICE_PORT $KEYSTONE_SERVICE_HOST $KEYSTONE_SERVICE_PORT_INT & |
| 308 | start_tls_proxy '*' $KEYSTONE_AUTH_PORT $KEYSTONE_AUTH_HOST $KEYSTONE_AUTH_PORT_INT & |
| 309 | fi |
Dean Troyer | d81a027 | 2012-08-31 18:04:55 -0500 | [diff] [blame] | 310 | } |
| 311 | |
| 312 | # stop_keystone() - Stop running processes |
| 313 | function stop_keystone() { |
| 314 | # Kill the Keystone screen window |
| 315 | screen -S $SCREEN_NAME -p key -X kill |
| 316 | } |
Dean Troyer | 7903b79 | 2012-09-13 17:16:12 -0500 | [diff] [blame] | 317 | |
| 318 | # Restore xtrace |
| 319 | $XTRACE |