| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 1 | # lib/heat | 
 | 2 | # Install and start Heat service | 
 | 3 | # To enable, add the following to localrc | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 4 | # ENABLED_SERVICES+=,heat,h-api-cfn,h-api-cw,h-eng,h-meta | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 5 |  | 
 | 6 | # Dependencies: | 
 | 7 | # - functions | 
 | 8 |  | 
 | 9 | # stack.sh | 
 | 10 | # --------- | 
 | 11 | # install_XXX | 
 | 12 | # configure_XXX | 
 | 13 | # init_XXX | 
 | 14 | # start_XXX | 
 | 15 | # stop_XXX | 
 | 16 | # cleanup_XXX | 
 | 17 |  | 
| Dean Troyer | 7903b79 | 2012-09-13 17:16:12 -0500 | [diff] [blame] | 18 | # Save trace setting | 
 | 19 | XTRACE=$(set +o | grep xtrace) | 
 | 20 | set +o xtrace | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 21 |  | 
 | 22 |  | 
 | 23 | # Defaults | 
 | 24 | # -------- | 
 | 25 | HEAT_DIR=$DEST/heat | 
| Steve Baker | 32761a4 | 2012-11-05 09:57:57 +1300 | [diff] [blame] | 26 | HEATCLIENT_DIR=$DEST/python-heatclient | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 27 | # set up default directories | 
 | 28 |  | 
 | 29 | # cleanup_heat() - Remove residual data files, anything left over from previous | 
 | 30 | # runs that a clean run would need to clean up | 
 | 31 | function cleanup_heat() { | 
 | 32 |     # This function intentionally left blank | 
 | 33 |     : | 
 | 34 | } | 
 | 35 |  | 
| Steve Baker | 32761a4 | 2012-11-05 09:57:57 +1300 | [diff] [blame] | 36 | # configure_heatclient() - Set config files, create data dirs, etc | 
 | 37 | function configure_heatclient() { | 
 | 38 |     setup_develop $HEATCLIENT_DIR | 
 | 39 | } | 
 | 40 |  | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 41 | # configure_heat() - Set config files, create data dirs, etc | 
 | 42 | function configure_heat() { | 
 | 43 |     setup_develop $HEAT_DIR | 
 | 44 |  | 
 | 45 |     HEAT_CONF_DIR=/etc/heat | 
 | 46 |     if [[ ! -d $HEAT_CONF_DIR ]]; then | 
 | 47 |         sudo mkdir -p $HEAT_CONF_DIR | 
 | 48 |     fi | 
 | 49 |     sudo chown `whoami` $HEAT_CONF_DIR | 
 | 50 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 51 |     HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST} | 
 | 52 |     HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000} | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 53 |     HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST} | 
 | 54 |     HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001} | 
 | 55 |     HEAT_METADATA_HOST=${HEAT_METADATA_HOST:-$SERVICE_HOST} | 
 | 56 |     HEAT_METADATA_PORT=${HEAT_METADATA_PORT:-8002} | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 57 |     HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST} | 
 | 58 |     HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003} | 
| Steve Baker | bb421be | 2012-10-10 13:19:10 +1300 | [diff] [blame] | 59 |     HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST} | 
 | 60 |     HEAT_API_PORT=${HEAT_API_PORT:-8004} | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 61 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 62 |     # cloudformation api | 
 | 63 |     HEAT_API_CFN_CONF=$HEAT_CONF_DIR/heat-api-cfn.conf | 
 | 64 |     cp $HEAT_DIR/etc/heat/heat-api-cfn.conf $HEAT_API_CFN_CONF | 
 | 65 |     iniset $HEAT_API_CFN_CONF DEFAULT debug True | 
 | 66 |     inicomment $HEAT_API_CFN_CONF DEFAULT log_file | 
 | 67 |     iniset $HEAT_API_CFN_CONF DEFAULT use_syslog $SYSLOG | 
 | 68 |     iniset $HEAT_API_CFN_CONF DEFAULT bind_host $HEAT_API_CFN_HOST | 
 | 69 |     iniset $HEAT_API_CFN_CONF DEFAULT bind_port $HEAT_API_CFN_PORT | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 70 |  | 
 | 71 |     if is_service_enabled rabbit; then | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 72 |         iniset $HEAT_API_CFN_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu | 
 | 73 |         iniset $HEAT_API_CFN_CONF DEFAULT rabbit_password $RABBIT_PASSWORD | 
 | 74 |         iniset $HEAT_API_CFN_CONF DEFAULT rabbit_host $RABBIT_HOST | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 75 |     elif is_service_enabled qpid; then | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 76 |         iniset $HEAT_API_CFN_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 77 |     fi | 
 | 78 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 79 |     HEAT_API_CFN_PASTE_INI=$HEAT_CONF_DIR/heat-api-cfn-paste.ini | 
 | 80 |     cp $HEAT_DIR/etc/heat/heat-api-cfn-paste.ini $HEAT_API_CFN_PASTE_INI | 
 | 81 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST | 
 | 82 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT | 
 | 83 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL | 
 | 84 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 85 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME | 
 | 86 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken admin_user heat | 
 | 87 |     iniset $HEAT_API_CFN_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD | 
 | 88 |     iniset $HEAT_API_CFN_PASTE_INI filter:ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 89 |     iniset $HEAT_API_CFN_PASTE_INI filter:ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 90 |  | 
| Steve Baker | bb421be | 2012-10-10 13:19:10 +1300 | [diff] [blame] | 91 |     # openstack api | 
 | 92 |     HEAT_API_CONF=$HEAT_CONF_DIR/heat-api.conf | 
 | 93 |     cp $HEAT_DIR/etc/heat/heat-api.conf $HEAT_API_CONF | 
 | 94 |     iniset $HEAT_API_CONF DEFAULT debug True | 
 | 95 |     inicomment $HEAT_API_CONF DEFAULT log_file | 
 | 96 |     iniset $HEAT_API_CONF DEFAULT use_syslog $SYSLOG | 
 | 97 |     iniset $HEAT_API_CONF DEFAULT bind_host $HEAT_API_HOST | 
 | 98 |     iniset $HEAT_API_CONF DEFAULT bind_port $HEAT_API_PORT | 
 | 99 |  | 
 | 100 |     if is_service_enabled rabbit; then | 
 | 101 |         iniset $HEAT_API_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu | 
 | 102 |         iniset $HEAT_API_CONF DEFAULT rabbit_password $RABBIT_PASSWORD | 
 | 103 |         iniset $HEAT_API_CONF DEFAULT rabbit_host $RABBIT_HOST | 
 | 104 |     elif is_service_enabled qpid; then | 
 | 105 |         iniset $HEAT_API_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid | 
 | 106 |     fi | 
 | 107 |  | 
 | 108 |     HEAT_API_PASTE_INI=$HEAT_CONF_DIR/heat-api-paste.ini | 
 | 109 |     cp $HEAT_DIR/etc/heat/heat-api-paste.ini $HEAT_API_PASTE_INI | 
 | 110 |     iniset $HEAT_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST | 
 | 111 |     iniset $HEAT_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT | 
 | 112 |     iniset $HEAT_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL | 
 | 113 |     iniset $HEAT_API_PASTE_INI filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 114 |     iniset $HEAT_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME | 
 | 115 |     iniset $HEAT_API_PASTE_INI filter:authtoken admin_user heat | 
 | 116 |     iniset $HEAT_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD | 
 | 117 |     iniset $HEAT_API_PASTE_INI filter:ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 118 |     iniset $HEAT_API_PASTE_INI filter:ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens | 
 | 119 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 120 |     # engine | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 121 |     HEAT_ENGINE_CONF=$HEAT_CONF_DIR/heat-engine.conf | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 122 |     cp $HEAT_DIR/etc/heat/heat-engine.conf $HEAT_ENGINE_CONF | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 123 |     iniset $HEAT_ENGINE_CONF DEFAULT debug True | 
 | 124 |     inicomment $HEAT_ENGINE_CONF DEFAULT log_file | 
 | 125 |     iniset $HEAT_ENGINE_CONF DEFAULT use_syslog $SYSLOG | 
 | 126 |     iniset $HEAT_ENGINE_CONF DEFAULT bind_host $HEAT_ENGINE_HOST | 
 | 127 |     iniset $HEAT_ENGINE_CONF DEFAULT bind_port $HEAT_ENGINE_PORT | 
| Terry Wilson | 428af5a | 2012-11-01 16:12:39 -0400 | [diff] [blame] | 128 |     local dburl | 
 | 129 |     database_connection_url dburl heat | 
 | 130 |     iniset $HEAT_ENGINE_CONF DEFAULT sql_connection $dburl | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 131 |     iniset $HEAT_ENGINE_CONF DEFAULT auth_encryption_key `hexdump -n 16 -v -e '/1 "%02x"' /dev/random` | 
 | 132 |  | 
 | 133 |     if is_service_enabled rabbit; then | 
 | 134 |         iniset $HEAT_ENGINE_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu | 
 | 135 |         iniset $HEAT_ENGINE_CONF DEFAULT rabbit_password $RABBIT_PASSWORD | 
 | 136 |         iniset $HEAT_ENGINE_CONF DEFAULT rabbit_host $RABBIT_HOST | 
 | 137 |     elif is_service_enabled qpid; then | 
 | 138 |         iniset $HEAT_ENGINE_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid | 
 | 139 |     fi | 
 | 140 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 141 |     # metadata api | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 142 |     HEAT_METADATA_CONF=$HEAT_CONF_DIR/heat-metadata.conf | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 143 |     cp $HEAT_DIR/etc/heat/heat-metadata.conf $HEAT_METADATA_CONF | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 144 |     iniset $HEAT_METADATA_CONF DEFAULT debug True | 
 | 145 |     inicomment $HEAT_METADATA_CONF DEFAULT log_file | 
 | 146 |     iniset $HEAT_METADATA_CONF DEFAULT use_syslog $SYSLOG | 
 | 147 |     iniset $HEAT_METADATA_CONF DEFAULT bind_host $HEAT_METADATA_HOST | 
 | 148 |     iniset $HEAT_METADATA_CONF DEFAULT bind_port $HEAT_METADATA_PORT | 
 | 149 |  | 
 | 150 |     if is_service_enabled rabbit; then | 
 | 151 |         iniset $HEAT_METADATA_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu | 
 | 152 |         iniset $HEAT_METADATA_CONF DEFAULT rabbit_password $RABBIT_PASSWORD | 
 | 153 |         iniset $HEAT_METADATA_CONF DEFAULT rabbit_host $RABBIT_HOST | 
 | 154 |     elif is_service_enabled qpid; then | 
 | 155 |         iniset $HEAT_METADATA_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid | 
 | 156 |     fi | 
 | 157 |  | 
 | 158 |     HEAT_METADATA_PASTE_INI=$HEAT_CONF_DIR/heat-metadata-paste.ini | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 159 |     cp $HEAT_DIR/etc/heat/heat-metadata-paste.ini $HEAT_METADATA_PASTE_INI | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 160 |  | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 161 |     # cloudwatch api | 
 | 162 |     HEAT_API_CW_CONF=$HEAT_CONF_DIR/heat-api-cloudwatch.conf | 
 | 163 |     cp $HEAT_DIR/etc/heat/heat-api-cloudwatch.conf $HEAT_API_CW_CONF | 
 | 164 |     iniset $HEAT_API_CW_CONF DEFAULT debug True | 
 | 165 |     inicomment $HEAT_API_CW_CONF DEFAULT log_file | 
 | 166 |     iniset $HEAT_API_CW_CONF DEFAULT use_syslog $SYSLOG | 
 | 167 |     iniset $HEAT_API_CW_CONF DEFAULT bind_host $HEAT_API_CW_HOST | 
 | 168 |     iniset $HEAT_API_CW_CONF DEFAULT bind_port $HEAT_API_CW_PORT | 
 | 169 |  | 
 | 170 |     if is_service_enabled rabbit; then | 
 | 171 |         iniset $HEAT_API_CW_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_kombu | 
 | 172 |         iniset $HEAT_API_CW_CONF DEFAULT rabbit_password $RABBIT_PASSWORD | 
 | 173 |         iniset $HEAT_API_CW_CONF DEFAULT rabbit_host $RABBIT_HOST | 
 | 174 |     elif is_service_enabled qpid; then | 
 | 175 |         iniset $HEAT_API_CW_CONF DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid | 
 | 176 |     fi | 
 | 177 |  | 
 | 178 |     HEAT_API_CW_PASTE_INI=$HEAT_CONF_DIR/heat-api-cloudwatch-paste.ini | 
 | 179 |     cp $HEAT_DIR/etc/heat/heat-api-cloudwatch-paste.ini $HEAT_API_CW_PASTE_INI | 
 | 180 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST | 
 | 181 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT | 
 | 182 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL | 
 | 183 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 184 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME | 
 | 185 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken admin_user heat | 
 | 186 |     iniset $HEAT_API_CW_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD | 
 | 187 |     iniset $HEAT_API_CW_PASTE_INI filter:ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 | 
 | 188 |     iniset $HEAT_API_CW_PASTE_INI filter:ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 189 | } | 
 | 190 |  | 
 | 191 | # init_heat() - Initialize database | 
 | 192 | function init_heat() { | 
 | 193 |  | 
 | 194 |     # (re)create heat database | 
| Terry Wilson | 428af5a | 2012-11-01 16:12:39 -0400 | [diff] [blame] | 195 |     recreate_database heat utf8 | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 196 |  | 
 | 197 |     $HEAT_DIR/bin/heat-db-setup $os_PACKAGE -r $MYSQL_PASSWORD | 
| Steve Baker | bad9d89 | 2012-10-25 14:49:47 +1300 | [diff] [blame] | 198 |     $HEAT_DIR/tools/nova_create_flavors.sh | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 199 | } | 
 | 200 |  | 
| Steve Baker | 32761a4 | 2012-11-05 09:57:57 +1300 | [diff] [blame] | 201 | # install_heatclient() - Collect source and prepare | 
 | 202 | function install_heatclient() { | 
 | 203 |     git_clone $HEATCLIENT_REPO $HEATCLIENT_DIR $HEATCLIENT_BRANCH | 
 | 204 | } | 
 | 205 |  | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 206 | # install_heat() - Collect source and prepare | 
 | 207 | function install_heat() { | 
 | 208 |     git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH | 
 | 209 | } | 
 | 210 |  | 
 | 211 | # start_heat() - Start running processes, including screen | 
 | 212 | function start_heat() { | 
 | 213 |     screen_it h-eng "cd $HEAT_DIR; bin/heat-engine --config-file=$HEAT_CONF_DIR/heat-engine.conf" | 
| Steve Baker | bb421be | 2012-10-10 13:19:10 +1300 | [diff] [blame] | 214 |     screen_it h-api "cd $HEAT_DIR; bin/heat-api --config-dir=$HEAT_CONF_DIR/heat-api.conf" | 
| Angus Salkeld | e279021 | 2012-09-11 11:24:09 +1000 | [diff] [blame] | 215 |     screen_it h-api-cfn "cd $HEAT_DIR; bin/heat-api-cfn --config-dir=$HEAT_CONF_DIR/heat-api-cfn.conf" | 
 | 216 |     screen_it h-api-cw "cd $HEAT_DIR; bin/heat-api-cloudwatch --config-dir=$HEAT_CONF_DIR/heat-api-cloudwatch.conf" | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 217 |     screen_it h-meta "cd $HEAT_DIR; bin/heat-metadata --config-dir=$HEAT_CONF_DIR/heat-metadata.conf" | 
 | 218 | } | 
 | 219 |  | 
| Dean Troyer | 699a29f | 2012-09-10 14:10:27 -0500 | [diff] [blame] | 220 | # stop_heat() - Stop running processes | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 221 | function stop_heat() { | 
| Dean Troyer | 699a29f | 2012-09-10 14:10:27 -0500 | [diff] [blame] | 222 |     # Kill the cinder screen windows | 
 | 223 |     for serv in h-eng h-api-cfn h-api-cw h-meta; do | 
 | 224 |         screen -S $SCREEN_NAME -p $serv -X kill | 
 | 225 |     done | 
| Steve Baker | bfdad75 | 2012-08-18 09:00:42 +1200 | [diff] [blame] | 226 | } | 
| Dean Troyer | 7903b79 | 2012-09-13 17:16:12 -0500 | [diff] [blame] | 227 |  | 
 | 228 | # Restore xtrace | 
 | 229 | $XTRACE |