Browse code

Cleanup tools scripts

* whitespace and comment cleanups only

Change-Id: I4e631e9a9b8151758dc8c96b3aef76b963d5ea7e

Dean Troyer authored on 2012/06/28 12:07:34
Showing 14 changed files
... ...
@@ -1,4 +1,7 @@
1 1
 #!/usr/bin/env bash
2
+
3
+# **build_bm.sh**
4
+
2 5
 # Build an OpenStack install on a bare metal machine.
3 6
 set +x
4 7
 
... ...
@@ -1,4 +1,7 @@
1 1
 #!/usr/bin/env bash
2
+
3
+# **build_bm_multi.sh**
4
+
2 5
 # Build an OpenStack install on several bare metal machines.
3 6
 SHELL_AFTER_RUN=no
4 7
 
... ...
@@ -1,5 +1,8 @@
1 1
 #!/bin/bash -e
2
-# build_pxe_env.sh - Create a PXE boot environment
2
+
3
+# **build_pxe_env.sh**
4
+
5
+# Create a PXE boot environment
3 6
 #
4 7
 # build_pxe_env.sh destdir
5 8
 #
... ...
@@ -1,7 +1,10 @@
1 1
 #!/bin/bash
2
-# build_ramdisk.sh - Build RAM disk images
3 2
 
4
-# exit on error to stop unexpected errors
3
+# **build_ramdisk.sh**
4
+
5
+# Build RAM disk images
6
+
7
+# Exit on error to stop unexpected errors
5 8
 set -o errexit
6 9
 
7 10
 if [ ! "$#" -eq "1" ]; then
... ...
@@ -84,7 +87,7 @@ fi
84 84
 # Finds the next available NBD device
85 85
 # Exits script if error connecting or none free
86 86
 # map_nbd image
87
-# returns full nbd device path
87
+# Returns full nbd device path
88 88
 function map_nbd {
89 89
     for i in `seq 0 15`; do
90 90
         if [ ! -e /sys/block/nbd$i/pid ]; then
... ...
@@ -105,7 +108,7 @@ function map_nbd {
105 105
     echo $NBD
106 106
 }
107 107
 
108
-# prime image with as many apt/pips as we can
108
+# Prime image with as many apt/pips as we can
109 109
 DEV_FILE=$CACHEDIR/$DIST_NAME-dev.img
110 110
 DEV_FILE_TMP=`mktemp $DEV_FILE.XXXXXX`
111 111
 if [ ! -r $DEV_FILE ]; then
... ...
@@ -127,11 +130,11 @@ if [ ! -r $DEV_FILE ]; then
127 127
     mkdir -p $MNTDIR/$DEST
128 128
     chroot $MNTDIR chown stack $DEST
129 129
 
130
-    # a simple password - pass
130
+    # A simple password - pass
131 131
     echo stack:pass | chroot $MNTDIR chpasswd
132 132
     echo root:$ROOT_PASSWORD | chroot $MNTDIR chpasswd
133 133
 
134
-    # and has sudo ability (in the future this should be limited to only what
134
+    # And has sudo ability (in the future this should be limited to only what
135 135
     # stack requires)
136 136
     echo "stack ALL=(ALL) NOPASSWD: ALL" >> $MNTDIR/etc/sudoers
137 137
 
... ...
@@ -143,7 +146,8 @@ if [ ! -r $DEV_FILE ]; then
143 143
 fi
144 144
 rm -f $DEV_FILE_TMP
145 145
 
146
-# clone git repositories onto the system
146
+
147
+# Clone git repositories onto the system
147 148
 # ======================================
148 149
 
149 150
 IMG_FILE_TMP=`mktemp $IMG_FILE.XXXXXX`
... ...
@@ -1,7 +1,8 @@
1 1
 #!/usr/bin/env bash
2 2
 #
3
-# build_tempest.sh - Checkout and prepare a Tempest repo
4
-#                    (https://github.com/openstack/tempest.git)
3
+# **build_tempest.sh**
4
+
5
+# Checkout and prepare a Tempest repo: https://github.com/openstack/tempest.git
5 6
 
6 7
 function usage {
7 8
     echo "$0 - Check out and prepare a Tempest repo"
... ...
@@ -1,5 +1,7 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
+# **build_uec.sh**
4
+
3 5
 # Make sure that we have the proper version of ubuntu (only works on oneiric)
4 6
 if ! egrep -q "oneiric" /etc/lsb-release; then
5 7
     echo "This script only works with ubuntu oneiric."
... ...
@@ -1,7 +1,10 @@
1 1
 #!/usr/bin/env bash
2
-# build_uec_ramdisk.sh - Build RAM disk images based on UEC image
3 2
 
4
-# exit on error to stop unexpected errors
3
+# **build_uec_ramdisk.sh**
4
+
5
+# Build RAM disk images based on UEC image
6
+
7
+# Exit on error to stop unexpected errors
5 8
 set -o errexit
6 9
 
7 10
 if [ ! "$#" -eq "1" ]; then
... ...
@@ -58,7 +61,7 @@ DIST_NAME=${DIST_NAME:-oneiric}
58 58
 # Configure how large the VM should be
59 59
 GUEST_SIZE=${GUEST_SIZE:-2G}
60 60
 
61
-# exit on error to stop unexpected errors
61
+# Exit on error to stop unexpected errors
62 62
 set -o errexit
63 63
 set -o xtrace
64 64
 
... ...
@@ -1,5 +1,8 @@
1 1
 #!/bin/bash -e
2
-# build_usb_boot.sh - Create a syslinux boot environment
2
+
3
+# **build_usb_boot.sh**
4
+
5
+# Create a syslinux boot environment
3 6
 #
4 7
 # build_usb_boot.sh destdev
5 8
 #
... ...
@@ -1,6 +1,8 @@
1 1
 #!/usr/bin/env bash
2 2
 #
3
-# configure_tempest.sh - Build a tempest configuration file from devstack
3
+# **configure_tempest.sh**
4
+
5
+# Build a tempest configuration file from devstack
4 6
 
5 7
 echo "**************************************************"
6 8
 echo "Configuring Tempest"
... ...
@@ -1,5 +1,7 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
+# **copy_dev_environment_to_uec.sh**
4
+
3 5
 # Echo commands
4 6
 set -o xtrace
5 7
 
... ...
@@ -1,5 +1,8 @@
1 1
 #!/bin/bash
2
-# get_uec_image.sh - Prepare Ubuntu UEC images
2
+
3
+# **get_uec_image.sh**
4
+
5
+# Download and prepare Ubuntu UEC images
3 6
 
4 7
 CACHEDIR=${CACHEDIR:-/opt/stack/cache}
5 8
 ROOTSIZE=${ROOTSIZE:-2000}
... ...
@@ -11,12 +14,12 @@ TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
11 11
 # Import common functions
12 12
 . $TOP_DIR/functions
13 13
 
14
-# exit on error to stop unexpected errors
14
+# Exit on error to stop unexpected errors
15 15
 set -o errexit
16 16
 set -o xtrace
17 17
 
18 18
 usage() {
19
-    echo "Usage: $0 - Fetch and prepare Ubuntu images"
19
+    echo "Usage: $0 - Download and prepare Ubuntu UEC images"
20 20
     echo ""
21 21
     echo "$0 [-r rootsize] release imagefile [kernel]"
22 22
     echo ""
... ...
@@ -1,5 +1,8 @@
1 1
 #!/usr/bin/env bash
2
-# info.sh - Produce a report on the state of devstack installs
2
+
3
+# **info.sh**
4
+
5
+# Produce a report on the state of devstack installs
3 6
 #
4 7
 # Output fields are separated with '|' chars
5 8
 # Output types are git,localrc,os,pip,pkg:
... ...
@@ -1,5 +1,8 @@
1 1
 #!/bin/bash
2
-# install_openvpn.sh - Install OpenVPN and generate required certificates
2
+
3
+# **install_openvpn.sh**
4
+
5
+# Install OpenVPN and generate required certificates
3 6
 #
4 7
 # install_openvpn.sh --client name
5 8
 # install_openvpn.sh --server [name]
... ...
@@ -1,5 +1,7 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
+# **warm_apts_and_pips_for_uec.sh**
4
+
3 5
 # Echo commands
4 6
 set -o xtrace
5 7