Dean Troyer | dff49a2 | 2014-01-30 15:37:40 -0600 | [diff] [blame] | 1 | # functions - DevStack-specific functions |
Dean Troyer | 13dc5cc | 2012-03-27 14:50:45 -0500 | [diff] [blame] | 2 | # |
Dean Troyer | 4a43b7b | 2012-08-28 17:43:40 -0500 | [diff] [blame] | 3 | # The following variables are assumed to be defined by certain functions: |
Adam Spiers | 6a5aa7c | 2013-10-24 11:27:02 +0100 | [diff] [blame] | 4 | # |
Dean Troyer | d8864fe | 2014-02-17 11:00:42 -0600 | [diff] [blame] | 5 | # - ``DATABASE_BACKENDS`` |
Adam Spiers | 6a5aa7c | 2013-10-24 11:27:02 +0100 | [diff] [blame] | 6 | # - ``ENABLED_SERVICES`` |
Adam Spiers | 6a5aa7c | 2013-10-24 11:27:02 +0100 | [diff] [blame] | 7 | # - ``FILES`` |
| 8 | # - ``GLANCE_HOSTPORT`` |
Dean Troyer | d8864fe | 2014-02-17 11:00:42 -0600 | [diff] [blame] | 9 | # |
Dean Troyer | 13dc5cc | 2012-03-27 14:50:45 -0500 | [diff] [blame] | 10 | |
Dean Troyer | dff49a2 | 2014-01-30 15:37:40 -0600 | [diff] [blame] | 11 | # Include the common functions |
| 12 | FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) |
| 13 | source ${FUNC_DIR}/functions-common |
Dean Troyer | 7f9aa71 | 2012-01-31 12:11:56 -0600 | [diff] [blame] | 14 | |
Dean Troyer | 27e3269 | 2012-03-16 16:16:56 -0500 | [diff] [blame] | 15 | # Save trace setting |
| 16 | XTRACE=$(set +o | grep xtrace) |
| 17 | set +o xtrace |
| 18 | |
Dean Troyer | 7f9aa71 | 2012-01-31 12:11:56 -0600 | [diff] [blame] | 19 | |
Chris Buccella | 610af8c | 2013-11-05 12:56:34 +0000 | [diff] [blame] | 20 | # Checks if installed Apache is <= given version |
| 21 | # $1 = x.y.z (version string of Apache) |
| 22 | function check_apache_version { |
| 23 | local cmd="apachectl" |
| 24 | if ! [[ -x $(which apachectl 2>/dev/null) ]]; then |
| 25 | cmd="/usr/sbin/apachectl" |
| 26 | fi |
| 27 | |
| 28 | local version=$($cmd -v | grep version | grep -Po 'Apache/\K[^ ]*') |
| 29 | expr "$version" '>=' $1 > /dev/null |
| 30 | } |
| 31 | |
Dean Troyer | 13dc5cc | 2012-03-27 14:50:45 -0500 | [diff] [blame] | 32 | |
Ian Wienand | 31dcd3e | 2013-07-16 13:36:34 +1000 | [diff] [blame] | 33 | # Cleanup anything from /tmp on unstack |
| 34 | # clean_tmp |
| 35 | function cleanup_tmp { |
| 36 | local tmp_dir=${TMPDIR:-/tmp} |
| 37 | |
| 38 | # see comments in pip_install |
| 39 | sudo rm -rf ${tmp_dir}/pip-build.* |
| 40 | } |
| 41 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 42 | |
Adam Spiers | cb96159 | 2013-10-05 12:11:07 +0100 | [diff] [blame] | 43 | # Retrieve an image from a URL and upload into Glance. |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 44 | # Uses the following variables: |
Adam Spiers | cb96159 | 2013-10-05 12:11:07 +0100 | [diff] [blame] | 45 | # |
| 46 | # - ``FILES`` must be set to the cache dir |
| 47 | # - ``GLANCE_HOSTPORT`` |
| 48 | # |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 49 | # upload_image image-url glance-token |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 50 | function upload_image { |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 51 | local image_url=$1 |
| 52 | local token=$2 |
| 53 | |
| 54 | # Create a directory for the downloaded image tarballs. |
| 55 | mkdir -p $FILES/images |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 56 | IMAGE_FNAME=`basename "$image_url"` |
Arnaud Legendre | 3e43944 | 2013-11-15 16:06:03 -0800 | [diff] [blame] | 57 | if [[ $image_url != file* ]]; then |
Sreeram Yerrapragada | 314af0a | 2014-03-03 21:34:45 -0800 | [diff] [blame] | 58 | # Downloads the image (uec ami+akistyle), then extracts it. |
Arnaud Legendre | 3e43944 | 2013-11-15 16:06:03 -0800 | [diff] [blame] | 59 | if [[ ! -f $FILES/$IMAGE_FNAME || "$(stat -c "%s" $FILES/$IMAGE_FNAME)" = "0" ]]; then |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 60 | wget -c $image_url -O $FILES/$IMAGE_FNAME |
| 61 | if [[ $? -ne 0 ]]; then |
| 62 | echo "Not found: $image_url" |
| 63 | return |
| 64 | fi |
Arnaud Legendre | 3e43944 | 2013-11-15 16:06:03 -0800 | [diff] [blame] | 65 | fi |
| 66 | IMAGE="$FILES/${IMAGE_FNAME}" |
| 67 | else |
| 68 | # File based URL (RFC 1738): file://host/path |
| 69 | # Remote files are not considered here. |
| 70 | # *nix: file:///home/user/path/file |
| 71 | # windows: file:///C:/Documents%20and%20Settings/user/path/file |
| 72 | IMAGE=$(echo $image_url | sed "s/^file:\/\///g") |
| 73 | if [[ ! -f $IMAGE || "$(stat -c "%s" $IMAGE)" == "0" ]]; then |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 74 | echo "Not found: $image_url" |
| 75 | return |
| 76 | fi |
| 77 | fi |
| 78 | |
| 79 | # OpenVZ-format images are provided as .tar.gz, but not decompressed prior to loading |
| 80 | if [[ "$image_url" =~ 'openvz' ]]; then |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 81 | IMAGE_NAME="${IMAGE_FNAME%.tar.gz}" |
| 82 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format ami --disk-format ami < "${IMAGE}" |
| 83 | return |
| 84 | fi |
| 85 | |
Sreeram Yerrapragada | cbaff86 | 2013-07-24 19:49:23 -0700 | [diff] [blame] | 86 | # vmdk format images |
| 87 | if [[ "$image_url" =~ '.vmdk' ]]; then |
Sreeram Yerrapragada | cbaff86 | 2013-07-24 19:49:23 -0700 | [diff] [blame] | 88 | IMAGE_NAME="${IMAGE_FNAME%.vmdk}" |
Ryan Hsu | a6273b9 | 2013-09-04 23:51:29 -0700 | [diff] [blame] | 89 | |
| 90 | # Before we can upload vmdk type images to glance, we need to know it's |
| 91 | # disk type, storage adapter, and networking adapter. These values are |
Ryan Hsu | bfb3e5e | 2013-11-11 21:20:14 -0800 | [diff] [blame] | 92 | # passed to glance as custom properties. |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 93 | # We take these values from the vmdk file if populated. Otherwise, we use |
Ryan Hsu | a6273b9 | 2013-09-04 23:51:29 -0700 | [diff] [blame] | 94 | # vmdk filename, which is expected in the following format: |
| 95 | # |
Ryan Hsu | bfb3e5e | 2013-11-11 21:20:14 -0800 | [diff] [blame] | 96 | # <name>-<disk type>;<storage adapter>;<network adapter> |
Ryan Hsu | a6273b9 | 2013-09-04 23:51:29 -0700 | [diff] [blame] | 97 | # |
| 98 | # If the filename does not follow the above format then the vsphere |
| 99 | # driver will supply default values. |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 100 | |
Ryan Hsu | bfb3e5e | 2013-11-11 21:20:14 -0800 | [diff] [blame] | 101 | vmdk_adapter_type="" |
| 102 | vmdk_disktype="" |
| 103 | vmdk_net_adapter="" |
| 104 | |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 105 | # vmdk adapter type |
Sreeram Yerrapragada | 314af0a | 2014-03-03 21:34:45 -0800 | [diff] [blame] | 106 | vmdk_adapter_type="$(head -25 $IMAGE | { grep -a -F -m 1 'ddb.adapterType =' $IMAGE || true; })" |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 107 | vmdk_adapter_type="${vmdk_adapter_type#*\"}" |
| 108 | vmdk_adapter_type="${vmdk_adapter_type%?}" |
| 109 | |
| 110 | # vmdk disk type |
Sreeram Yerrapragada | 314af0a | 2014-03-03 21:34:45 -0800 | [diff] [blame] | 111 | vmdk_create_type="$(head -25 $IMAGE | { grep -a -F -m 1 'createType=' $IMAGE || true; })" |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 112 | vmdk_create_type="${vmdk_create_type#*\"}" |
Arnaud Legendre | 8dad4bd | 2014-02-03 17:57:39 -0800 | [diff] [blame] | 113 | vmdk_create_type="${vmdk_create_type%\"*}" |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 114 | |
| 115 | descriptor_data_pair_msg="Monolithic flat and VMFS disks "` |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 116 | `"should use a descriptor-data pair." |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 117 | if [[ "$vmdk_create_type" = "monolithicSparse" ]]; then |
| 118 | vmdk_disktype="sparse" |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 119 | elif [[ "$vmdk_create_type" = "monolithicFlat" || \ |
| 120 | "$vmdk_create_type" = "vmfs" ]]; then |
| 121 | # Attempt to retrieve the *-flat.vmdk |
Sreeram Yerrapragada | 314af0a | 2014-03-03 21:34:45 -0800 | [diff] [blame] | 122 | flat_fname="$(head -25 $IMAGE | { grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $IMAGE || true; })" |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 123 | flat_fname="${flat_fname#*\"}" |
| 124 | flat_fname="${flat_fname%?}" |
| 125 | if [[ -z "$flat_name" ]]; then |
| 126 | flat_fname="$IMAGE_NAME-flat.vmdk" |
| 127 | fi |
| 128 | path_len=`expr ${#image_url} - ${#IMAGE_FNAME}` |
| 129 | flat_url="${image_url:0:$path_len}$flat_fname" |
| 130 | warn $LINENO "$descriptor_data_pair_msg"` |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 131 | `" Attempt to retrieve the *-flat.vmdk: $flat_url" |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 132 | if [[ $flat_url != file* ]]; then |
| 133 | if [[ ! -f $FILES/$flat_fname || \ |
| 134 | "$(stat -c "%s" $FILES/$flat_fname)" = "0" ]]; then |
| 135 | wget -c $flat_url -O $FILES/$flat_fname |
| 136 | if [[ $? -ne 0 ]]; then |
| 137 | echo "Flat disk not found: $flat_url" |
| 138 | flat_found=false |
| 139 | fi |
| 140 | fi |
| 141 | if $flat_found; then |
| 142 | IMAGE="$FILES/${flat_fname}" |
| 143 | fi |
| 144 | else |
| 145 | IMAGE=$(echo $flat_url | sed "s/^file:\/\///g") |
| 146 | if [[ ! -f $IMAGE || "$(stat -c "%s" $IMAGE)" == "0" ]]; then |
| 147 | echo "Flat disk not found: $flat_url" |
| 148 | flat_found=false |
| 149 | fi |
| 150 | if ! $flat_found; then |
| 151 | IMAGE=$(echo $image_url | sed "s/^file:\/\///g") |
| 152 | fi |
| 153 | fi |
| 154 | if $flat_found; then |
| 155 | IMAGE_NAME="${flat_fname}" |
| 156 | fi |
| 157 | vmdk_disktype="preallocated" |
Arnaud Legendre | 8dad4bd | 2014-02-03 17:57:39 -0800 | [diff] [blame] | 158 | elif [[ "$vmdk_create_type" = "streamOptimized" ]]; then |
| 159 | vmdk_disktype="streamOptimized" |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 160 | elif [[ -z "$vmdk_create_type" ]]; then |
| 161 | # *-flat.vmdk provided: attempt to retrieve the descriptor (*.vmdk) |
| 162 | # to retrieve appropriate metadata |
| 163 | if [[ ${IMAGE_NAME: -5} != "-flat" ]]; then |
| 164 | warn $LINENO "Expected filename suffix: '-flat'."` |
| 165 | `" Filename provided: ${IMAGE_NAME}" |
Ryan Hsu | 99b622a | 2014-03-05 15:35:49 -0800 | [diff] [blame] | 166 | fi |
| 167 | |
| 168 | descriptor_fname="${IMAGE_NAME:0:${#IMAGE_NAME} - 5}.vmdk" |
| 169 | path_len=`expr ${#image_url} - ${#IMAGE_FNAME}` |
| 170 | flat_path="${image_url:0:$path_len}" |
| 171 | descriptor_url=$flat_path$descriptor_fname |
| 172 | warn $LINENO "$descriptor_data_pair_msg"` |
| 173 | `" Attempt to retrieve the descriptor *.vmdk: $descriptor_url" |
| 174 | if [[ $flat_path != file* ]]; then |
| 175 | if [[ ! -f $FILES/$descriptor_fname || \ |
| 176 | "$(stat -c "%s" $FILES/$descriptor_fname)" = "0" ]]; then |
| 177 | wget -c $descriptor_url -O $FILES/$descriptor_fname |
| 178 | if [[ $? -ne 0 ]]; then |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 179 | warn $LINENO "Descriptor not found $descriptor_url" |
| 180 | descriptor_found=false |
Arnaud Legendre | 90bcd2f | 2013-11-22 16:05:39 -0800 | [diff] [blame] | 181 | fi |
| 182 | fi |
Ryan Hsu | 99b622a | 2014-03-05 15:35:49 -0800 | [diff] [blame] | 183 | descriptor_url="$FILES/$descriptor_fname" |
| 184 | else |
| 185 | descriptor_url=$(echo $descriptor_url | sed "s/^file:\/\///g") |
| 186 | if [[ ! -f $descriptor_url || \ |
| 187 | "$(stat -c "%s" $descriptor_url)" == "0" ]]; then |
| 188 | warn $LINENO "Descriptor not found $descriptor_url" |
| 189 | descriptor_found=false |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 190 | fi |
| 191 | fi |
Ryan Hsu | 99b622a | 2014-03-05 15:35:49 -0800 | [diff] [blame] | 192 | if $descriptor_found; then |
| 193 | vmdk_adapter_type="$(head -25 $descriptor_url | { grep -a -F -m 1 'ddb.adapterType =' $descriptor_url || true; })" |
| 194 | vmdk_adapter_type="${vmdk_adapter_type#*\"}" |
| 195 | vmdk_adapter_type="${vmdk_adapter_type%?}" |
| 196 | fi |
Isaku Yamahata | 6681a4f | 2014-01-10 15:28:29 +0900 | [diff] [blame] | 197 | vmdk_disktype="preallocated" |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 198 | else |
Arnaud Legendre | 5ea53ee | 2013-11-01 16:42:54 -0700 | [diff] [blame] | 199 | vmdk_disktype="preallocated" |
| 200 | fi |
Ryan Hsu | bfb3e5e | 2013-11-11 21:20:14 -0800 | [diff] [blame] | 201 | |
| 202 | # NOTE: For backwards compatibility reasons, colons may be used in place |
| 203 | # of semi-colons for property delimiters but they are not permitted |
| 204 | # characters in NTFS filesystems. |
Sreeram Yerrapragada | 314af0a | 2014-03-03 21:34:45 -0800 | [diff] [blame] | 205 | property_string=`echo "$IMAGE_NAME" | { grep -oP '(?<=-)(?!.*-).*[:;].*[:;].*$' || true; }` |
Ryan Hsu | bfb3e5e | 2013-11-11 21:20:14 -0800 | [diff] [blame] | 206 | IFS=':;' read -a props <<< "$property_string" |
| 207 | vmdk_disktype="${props[0]:-$vmdk_disktype}" |
| 208 | vmdk_adapter_type="${props[1]:-$vmdk_adapter_type}" |
| 209 | vmdk_net_adapter="${props[2]:-$vmdk_net_adapter}" |
Ryan Hsu | a6273b9 | 2013-09-04 23:51:29 -0700 | [diff] [blame] | 210 | |
Ryan Hsu | 49f4486 | 2013-10-03 22:27:03 -0700 | [diff] [blame] | 211 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format bare --disk-format vmdk --property vmware_disktype="$vmdk_disktype" --property vmware_adaptertype="$vmdk_adapter_type" --property hw_vif_model="$vmdk_net_adapter" < "${IMAGE}" |
Sreeram Yerrapragada | cbaff86 | 2013-07-24 19:49:23 -0700 | [diff] [blame] | 212 | return |
| 213 | fi |
| 214 | |
Mate Lakat | bc2ef92 | 2013-08-15 18:06:59 +0100 | [diff] [blame] | 215 | # XenServer-vhd-ovf-format images are provided as .vhd.tgz |
Davanum Srinivas | 316ed6c | 2013-02-06 15:29:49 -0500 | [diff] [blame] | 216 | # and should not be decompressed prior to loading |
| 217 | if [[ "$image_url" =~ '.vhd.tgz' ]]; then |
Davanum Srinivas | 316ed6c | 2013-02-06 15:29:49 -0500 | [diff] [blame] | 218 | IMAGE_NAME="${IMAGE_FNAME%.vhd.tgz}" |
| 219 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format=ovf --disk-format=vhd < "${IMAGE}" |
| 220 | return |
| 221 | fi |
| 222 | |
Mate Lakat | bc2ef92 | 2013-08-15 18:06:59 +0100 | [diff] [blame] | 223 | # .xen-raw.tgz suggests a Xen capable raw image inside a tgz. |
| 224 | # and should not be decompressed prior to loading. |
| 225 | # Setting metadata, so PV mode is used. |
| 226 | if [[ "$image_url" =~ '.xen-raw.tgz' ]]; then |
Mate Lakat | bc2ef92 | 2013-08-15 18:06:59 +0100 | [diff] [blame] | 227 | IMAGE_NAME="${IMAGE_FNAME%.xen-raw.tgz}" |
| 228 | glance \ |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 229 | --os-auth-token $token \ |
| 230 | --os-image-url http://$GLANCE_HOSTPORT \ |
| 231 | image-create \ |
Mate Lakat | bc2ef92 | 2013-08-15 18:06:59 +0100 | [diff] [blame] | 232 | --name "$IMAGE_NAME" --is-public=True \ |
| 233 | --container-format=tgz --disk-format=raw \ |
| 234 | --property vm_mode=xen < "${IMAGE}" |
| 235 | return |
| 236 | fi |
| 237 | |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 238 | KERNEL="" |
| 239 | RAMDISK="" |
| 240 | DISK_FORMAT="" |
| 241 | CONTAINER_FORMAT="" |
| 242 | UNPACK="" |
| 243 | case "$IMAGE_FNAME" in |
| 244 | *.tar.gz|*.tgz) |
| 245 | # Extract ami and aki files |
| 246 | [ "${IMAGE_FNAME%.tar.gz}" != "$IMAGE_FNAME" ] && |
| 247 | IMAGE_NAME="${IMAGE_FNAME%.tar.gz}" || |
| 248 | IMAGE_NAME="${IMAGE_FNAME%.tgz}" |
| 249 | xdir="$FILES/images/$IMAGE_NAME" |
| 250 | rm -Rf "$xdir"; |
| 251 | mkdir "$xdir" |
| 252 | tar -zxf $FILES/$IMAGE_FNAME -C "$xdir" |
| 253 | KERNEL=$(for f in "$xdir/"*-vmlinuz* "$xdir/"aki-*/image; do |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 254 | [ -f "$f" ] && echo "$f" && break; done; true) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 255 | RAMDISK=$(for f in "$xdir/"*-initrd* "$xdir/"ari-*/image; do |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 256 | [ -f "$f" ] && echo "$f" && break; done; true) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 257 | IMAGE=$(for f in "$xdir/"*.img "$xdir/"ami-*/image; do |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 258 | [ -f "$f" ] && echo "$f" && break; done; true) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 259 | if [[ -z "$IMAGE_NAME" ]]; then |
| 260 | IMAGE_NAME=$(basename "$IMAGE" ".img") |
| 261 | fi |
| 262 | ;; |
| 263 | *.img) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 264 | IMAGE_NAME=$(basename "$IMAGE" ".img") |
Dean Troyer | 636a3ff | 2012-09-14 11:36:07 -0500 | [diff] [blame] | 265 | format=$(qemu-img info ${IMAGE} | awk '/^file format/ { print $3; exit }') |
| 266 | if [[ ",qcow2,raw,vdi,vmdk,vpc," =~ ",$format," ]]; then |
| 267 | DISK_FORMAT=$format |
| 268 | else |
| 269 | DISK_FORMAT=raw |
| 270 | fi |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 271 | CONTAINER_FORMAT=bare |
| 272 | ;; |
| 273 | *.img.gz) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 274 | IMAGE_NAME=$(basename "$IMAGE" ".img.gz") |
| 275 | DISK_FORMAT=raw |
| 276 | CONTAINER_FORMAT=bare |
| 277 | UNPACK=zcat |
| 278 | ;; |
| 279 | *.qcow2) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 280 | IMAGE_NAME=$(basename "$IMAGE" ".qcow2") |
| 281 | DISK_FORMAT=qcow2 |
| 282 | CONTAINER_FORMAT=bare |
| 283 | ;; |
Jonathan Michalon | 0680204 | 2013-03-21 14:29:58 +0100 | [diff] [blame] | 284 | *.iso) |
Jonathan Michalon | 0680204 | 2013-03-21 14:29:58 +0100 | [diff] [blame] | 285 | IMAGE_NAME=$(basename "$IMAGE" ".iso") |
| 286 | DISK_FORMAT=iso |
| 287 | CONTAINER_FORMAT=bare |
| 288 | ;; |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 289 | *) echo "Do not know what to do with $IMAGE_FNAME"; false;; |
| 290 | esac |
| 291 | |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 292 | if is_arch "ppc64"; then |
Rafael Folco | 0b03e7a | 2014-03-14 11:14:57 -0300 | [diff] [blame^] | 293 | IMG_PROPERTY="--property hw_cdrom_bus=scsi" |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 294 | fi |
| 295 | |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 296 | if [ "$CONTAINER_FORMAT" = "bare" ]; then |
| 297 | if [ "$UNPACK" = "zcat" ]; then |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 298 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" $IMG_PROPERTY --is-public True --container-format=$CONTAINER_FORMAT --disk-format $DISK_FORMAT < <(zcat --force "${IMAGE}") |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 299 | else |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 300 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" $IMG_PROPERTY --is-public True --container-format=$CONTAINER_FORMAT --disk-format $DISK_FORMAT < "${IMAGE}" |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 301 | fi |
| 302 | else |
| 303 | # Use glance client to add the kernel the root filesystem. |
| 304 | # We parse the results of the first upload to get the glance ID of the |
| 305 | # kernel for use when uploading the root filesystem. |
| 306 | KERNEL_ID=""; RAMDISK_ID=""; |
| 307 | if [ -n "$KERNEL" ]; then |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 308 | KERNEL_ID=$(glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-kernel" $IMG_PROPERTY --is-public True --container-format aki --disk-format aki < "$KERNEL" | grep ' id ' | get_field 2) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 309 | fi |
| 310 | if [ -n "$RAMDISK" ]; then |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 311 | RAMDISK_ID=$(glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME-ramdisk" $IMG_PROPERTY --is-public True --container-format ari --disk-format ari < "$RAMDISK" | grep ' id ' | get_field 2) |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 312 | fi |
Rafael Folco | ab77587 | 2013-12-02 14:04:32 -0200 | [diff] [blame] | 313 | glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "${IMAGE_NAME%.img}" $IMG_PROPERTY --is-public True --container-format ami --disk-format ami ${KERNEL_ID:+--property kernel_id=$KERNEL_ID} ${RAMDISK_ID:+--property ramdisk_id=$RAMDISK_ID} < "${IMAGE}" |
Dean Troyer | ca0e3d0 | 2012-04-13 15:58:37 -0500 | [diff] [blame] | 314 | fi |
| 315 | } |
| 316 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 317 | |
Dean Troyer | c1b486a | 2012-11-05 14:26:09 -0600 | [diff] [blame] | 318 | # Set the database backend to use |
| 319 | # When called from stackrc/localrc DATABASE_BACKENDS has not been |
| 320 | # initialized yet, just save the configuration selection and call back later |
| 321 | # to validate it. |
Adam Spiers | cb96159 | 2013-10-05 12:11:07 +0100 | [diff] [blame] | 322 | # |
| 323 | # ``$1`` - the name of the database backend to use (mysql, postgresql, ...) |
Dean Troyer | c1b486a | 2012-11-05 14:26:09 -0600 | [diff] [blame] | 324 | function use_database { |
| 325 | if [[ -z "$DATABASE_BACKENDS" ]]; then |
Dean Troyer | afc29fe | 2013-02-07 15:56:24 -0600 | [diff] [blame] | 326 | # No backends registered means this is likely called from ``localrc`` |
| 327 | # This is now deprecated usage |
Dean Troyer | c1b486a | 2012-11-05 14:26:09 -0600 | [diff] [blame] | 328 | DATABASE_TYPE=$1 |
Bob Ball | 3aa8887 | 2013-02-28 17:39:41 +0000 | [diff] [blame] | 329 | DEPRECATED_TEXT="$DEPRECATED_TEXT\nThe database backend needs to be properly set in ENABLED_SERVICES; use_database is deprecated localrc\n" |
Attila Fazekas | 251d3b5 | 2012-12-16 15:05:44 +0100 | [diff] [blame] | 330 | else |
Dean Troyer | afc29fe | 2013-02-07 15:56:24 -0600 | [diff] [blame] | 331 | # This should no longer get called...here for posterity |
Attila Fazekas | 251d3b5 | 2012-12-16 15:05:44 +0100 | [diff] [blame] | 332 | use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1 |
Dean Troyer | c1b486a | 2012-11-05 14:26:09 -0600 | [diff] [blame] | 333 | fi |
Dean Troyer | c1b486a | 2012-11-05 14:26:09 -0600 | [diff] [blame] | 334 | } |
| 335 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 336 | |
Dean Troyer | 3a3a2ba | 2012-12-11 15:26:24 -0600 | [diff] [blame] | 337 | # Wait for an HTTP server to start answering requests |
| 338 | # wait_for_service timeout url |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 339 | function wait_for_service { |
Dean Troyer | 3a3a2ba | 2012-12-11 15:26:24 -0600 | [diff] [blame] | 340 | local timeout=$1 |
| 341 | local url=$2 |
JUN JIE NAN | 0aa8534 | 2013-09-13 15:47:09 +0800 | [diff] [blame] | 342 | timeout $timeout sh -c "while ! curl --noproxy '*' -s $url >/dev/null; do sleep 1; done" |
Dean Troyer | 3a3a2ba | 2012-12-11 15:26:24 -0600 | [diff] [blame] | 343 | } |
| 344 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 345 | |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 346 | # ping check |
| 347 | # Uses globals ``ENABLED_SERVICES`` |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 348 | # ping_check from-net ip boot-timeout expected |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 349 | function ping_check { |
Mark McClain | b05c876 | 2013-07-06 23:29:39 -0400 | [diff] [blame] | 350 | if is_service_enabled neutron; then |
| 351 | _ping_check_neutron "$1" $2 $3 $4 |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 352 | return |
| 353 | fi |
| 354 | _ping_check_novanet "$1" $2 $3 $4 |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 355 | } |
| 356 | |
| 357 | # ping check for nova |
| 358 | # Uses globals ``MULTI_HOST``, ``PRIVATE_NETWORK`` |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 359 | function _ping_check_novanet { |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 360 | local from_net=$1 |
| 361 | local ip=$2 |
| 362 | local boot_timeout=$3 |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 363 | local expected=${4:-"True"} |
| 364 | local check_command="" |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 365 | MULTI_HOST=`trueorfalse False $MULTI_HOST` |
| 366 | if [[ "$MULTI_HOST" = "True" && "$from_net" = "$PRIVATE_NETWORK_NAME" ]]; then |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 367 | return |
| 368 | fi |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 369 | if [[ "$expected" = "True" ]]; then |
| 370 | check_command="while ! ping -c1 -w1 $ip; do sleep 1; done" |
| 371 | else |
| 372 | check_command="while ping -c1 -w1 $ip; do sleep 1; done" |
| 373 | fi |
| 374 | if ! timeout $boot_timeout sh -c "$check_command"; then |
| 375 | if [[ "$expected" = "True" ]]; then |
Nachi Ueno | 07115eb | 2013-02-26 12:38:18 -0800 | [diff] [blame] | 376 | die $LINENO "[Fail] Couldn't ping server" |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 377 | else |
Nachi Ueno | 07115eb | 2013-02-26 12:38:18 -0800 | [diff] [blame] | 378 | die $LINENO "[Fail] Could ping server" |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 379 | fi |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 380 | fi |
| 381 | } |
| 382 | |
Nachi Ueno | 6769b16 | 2013-08-12 18:18:56 -0700 | [diff] [blame] | 383 | # Get ip of instance |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 384 | function get_instance_ip { |
Nachi Ueno | 6769b16 | 2013-08-12 18:18:56 -0700 | [diff] [blame] | 385 | local vm_id=$1 |
| 386 | local network_name=$2 |
| 387 | local nova_result="$(nova show $vm_id)" |
| 388 | local ip=$(echo "$nova_result" | grep "$network_name" | get_field 2) |
| 389 | if [[ $ip = "" ]];then |
| 390 | echo "$nova_result" |
| 391 | die $LINENO "[Fail] Coudn't get ipaddress of VM" |
Nachi Ueno | 6769b16 | 2013-08-12 18:18:56 -0700 | [diff] [blame] | 392 | fi |
| 393 | echo $ip |
| 394 | } |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 395 | |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 396 | # ssh check |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 397 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 398 | # ssh_check net-name key-file floating-ip default-user active-timeout |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 399 | function ssh_check { |
Mark McClain | b05c876 | 2013-07-06 23:29:39 -0400 | [diff] [blame] | 400 | if is_service_enabled neutron; then |
| 401 | _ssh_check_neutron "$1" $2 $3 $4 $5 |
Nachi Ueno | 5db5bfa | 2012-10-29 11:25:29 -0700 | [diff] [blame] | 402 | return |
| 403 | fi |
| 404 | _ssh_check_novanet "$1" $2 $3 $4 $5 |
| 405 | } |
| 406 | |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 407 | function _ssh_check_novanet { |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 408 | local NET_NAME=$1 |
| 409 | local KEY_FILE=$2 |
| 410 | local FLOATING_IP=$3 |
| 411 | local DEFAULT_INSTANCE_USER=$4 |
| 412 | local ACTIVE_TIMEOUT=$5 |
Dean Troyer | 6931c13 | 2012-11-07 16:51:21 -0600 | [diff] [blame] | 413 | local probe_cmd="" |
Dean Troyer | cc6b443 | 2013-04-08 15:38:03 -0500 | [diff] [blame] | 414 | if ! timeout $ACTIVE_TIMEOUT sh -c "while ! ssh -o StrictHostKeyChecking=no -i $KEY_FILE ${DEFAULT_INSTANCE_USER}@$FLOATING_IP echo success; do sleep 1; done"; then |
Nachi Ueno | 07115eb | 2013-02-26 12:38:18 -0800 | [diff] [blame] | 415 | die $LINENO "server didn't become ssh-able!" |
Nachi Ueno | fda946e | 2012-10-24 17:26:02 -0700 | [diff] [blame] | 416 | fi |
| 417 | } |
Dean Troyer | 13dc5cc | 2012-03-27 14:50:45 -0500 | [diff] [blame] | 418 | |
Vincent Untz | 856a11e | 2012-11-21 16:04:12 +0100 | [diff] [blame] | 419 | |
Vincent Untz | 856a11e | 2012-11-21 16:04:12 +0100 | [diff] [blame] | 420 | # Get the location of the $module-rootwrap executables, where module is cinder |
| 421 | # or nova. |
| 422 | # get_rootwrap_location module |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 423 | function get_rootwrap_location { |
Vincent Untz | 856a11e | 2012-11-21 16:04:12 +0100 | [diff] [blame] | 424 | local module=$1 |
| 425 | |
Jakub Ruzicka | 4196d55 | 2013-01-30 15:35:54 +0100 | [diff] [blame] | 426 | echo "$(get_python_exec_prefix)/$module-rootwrap" |
Vincent Untz | 856a11e | 2012-11-21 16:04:12 +0100 | [diff] [blame] | 427 | } |
| 428 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 429 | |
Ian Wienand | 0488edd | 2013-04-11 12:04:36 +1000 | [diff] [blame] | 430 | # Path permissions sanity check |
| 431 | # check_path_perm_sanity path |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 432 | function check_path_perm_sanity { |
Ian Wienand | 0488edd | 2013-04-11 12:04:36 +1000 | [diff] [blame] | 433 | # Ensure no element of the path has 0700 permissions, which is very |
| 434 | # likely to cause issues for daemons. Inspired by default 0700 |
| 435 | # homedir permissions on RHEL and common practice of making DEST in |
| 436 | # the stack user's homedir. |
| 437 | |
| 438 | local real_path=$(readlink -f $1) |
| 439 | local rebuilt_path="" |
| 440 | for i in $(echo ${real_path} | tr "/" " "); do |
| 441 | rebuilt_path=$rebuilt_path"/"$i |
| 442 | |
| 443 | if [[ $(stat -c '%a' ${rebuilt_path}) = 700 ]]; then |
| 444 | echo "*** DEST path element" |
| 445 | echo "*** ${rebuilt_path}" |
| 446 | echo "*** appears to have 0700 permissions." |
| 447 | echo "*** This is very likely to cause fatal issues for devstack daemons." |
| 448 | |
| 449 | if [[ -n "$SKIP_PATH_SANITY" ]]; then |
| 450 | return |
| 451 | else |
| 452 | echo "*** Set SKIP_PATH_SANITY to skip this check" |
| 453 | die $LINENO "Invalid path permissions" |
| 454 | fi |
| 455 | fi |
| 456 | done |
| 457 | } |
| 458 | |
Dean Troyer | 1a6d449 | 2013-06-03 16:47:36 -0500 | [diff] [blame] | 459 | |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 460 | # This function recursively compares versions, and is not meant to be |
| 461 | # called by anything other than vercmp_numbers below. This function does |
| 462 | # not work with alphabetic versions. |
| 463 | # |
| 464 | # _vercmp_r sep ver1 ver2 |
| 465 | function _vercmp_r { |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 466 | typeset sep |
| 467 | typeset -a ver1=() ver2=() |
| 468 | sep=$1; shift |
| 469 | ver1=("${@:1:sep}") |
| 470 | ver2=("${@:sep+1}") |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 471 | |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 472 | if ((ver1 > ver2)); then |
| 473 | echo 1; return 0 |
| 474 | elif ((ver2 > ver1)); then |
| 475 | echo -1; return 0 |
| 476 | fi |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 477 | |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 478 | if ((sep <= 1)); then |
| 479 | echo 0; return 0 |
| 480 | fi |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 481 | |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 482 | _vercmp_r $((sep-1)) "${ver1[@]:1}" "${ver2[@]:1}" |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 483 | } |
| 484 | |
| 485 | |
| 486 | # This function compares two versions and is meant to be called by |
| 487 | # external callers. Please note the function assumes non-alphabetic |
| 488 | # versions. For example, this will work: |
| 489 | # |
| 490 | # vercmp_numbers 1.10 1.4 |
| 491 | # |
| 492 | # The above will return "1", as 1.10 is greater than 1.4. |
| 493 | # |
| 494 | # vercmp_numbers 5.2 6.4 |
| 495 | # |
| 496 | # The above will return "-1", as 5.2 is less than 6.4. |
| 497 | # |
| 498 | # vercmp_numbers 4.0 4.0 |
| 499 | # |
| 500 | # The above will return "0", as the versions are equal. |
| 501 | # |
| 502 | # vercmp_numbers ver1 ver2 |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 503 | function vercmp_numbers { |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 504 | typeset v1=$1 v2=$2 sep |
| 505 | typeset -a ver1 ver2 |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 506 | |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 507 | IFS=. read -ra ver1 <<< "$v1" |
| 508 | IFS=. read -ra ver2 <<< "$v2" |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 509 | |
Sean Dague | 537d402 | 2013-10-22 07:43:22 -0400 | [diff] [blame] | 510 | _vercmp_r "${#ver1[@]}" "${ver1[@]}" "${ver2[@]}" |
Kyle Mestery | 51a3f1f | 2013-06-13 11:47:56 +0000 | [diff] [blame] | 511 | } |
| 512 | |
| 513 | |
Salvatore Orlando | 05ae833 | 2013-08-20 14:51:08 -0700 | [diff] [blame] | 514 | # This function sets log formatting options for colorizing log |
| 515 | # output to stdout. It is meant to be called by lib modules. |
| 516 | # The last two parameters are optional and can be used to specify |
| 517 | # non-default value for project and user format variables. |
| 518 | # Defaults are respectively 'project_name' and 'user_name' |
| 519 | # |
| 520 | # setup_colorized_logging something.conf SOMESECTION |
Ian Wienand | aee18c7 | 2014-02-21 15:35:08 +1100 | [diff] [blame] | 521 | function setup_colorized_logging { |
Salvatore Orlando | 05ae833 | 2013-08-20 14:51:08 -0700 | [diff] [blame] | 522 | local conf_file=$1 |
| 523 | local conf_section=$2 |
| 524 | local project_var=${3:-"project_name"} |
| 525 | local user_var=${4:-"user_name"} |
| 526 | # Add color to logging output |
| 527 | iniset $conf_file $conf_section logging_context_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[01;36m%(request_id)s [00;36m%("$user_var")s %("$project_var")s%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
| 528 | iniset $conf_file $conf_section logging_default_format_string "%(asctime)s.%(msecs)03d %(color)s%(levelname)s %(name)s [[00;36m-%(color)s] [01;35m%(instance)s%(color)s%(message)s[00m" |
| 529 | iniset $conf_file $conf_section logging_debug_format_suffix "[00;33mfrom (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d[00m" |
| 530 | iniset $conf_file $conf_section logging_exception_prefix "%(color)s%(asctime)s.%(msecs)03d TRACE %(name)s [01;35m%(instance)s[00m" |
| 531 | } |
| 532 | |
Dean Troyer | dff49a2 | 2014-01-30 15:37:40 -0600 | [diff] [blame] | 533 | |
Dean Troyer | 27e3269 | 2012-03-16 16:16:56 -0500 | [diff] [blame] | 534 | # Restore xtrace |
Chmouel Boudjnah | 408b009 | 2012-03-15 23:21:55 +0000 | [diff] [blame] | 535 | $XTRACE |
Dean Troyer | 4a43b7b | 2012-08-28 17:43:40 -0500 | [diff] [blame] | 536 | |
Dean Troyer | 4a43b7b | 2012-08-28 17:43:40 -0500 | [diff] [blame] | 537 | # Local variables: |
Sean Dague | 584d90e | 2013-03-29 14:34:53 -0400 | [diff] [blame] | 538 | # mode: shell-script |
Andrew Laski | f900bd7 | 2012-09-05 17:23:14 -0400 | [diff] [blame] | 539 | # End: |