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