diff --git a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 index b42a06d7..7e71d586 100644 --- a/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 +++ b/labs/lib/osbash/lib.ubuntu-12.04.4-server-amd64 @@ -15,17 +15,17 @@ readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-guides/plain readonly _PS_all=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-all-v2.cfg readonly _BOOT_ARGS="/install/vmlinuz - noapic - preseed/url=%s - debian-installer=en_US - auto=true - locale=en_US - hostname=osbash - fb=false - debconf/frontend=noninteractive - keyboard-configuration/modelcode=SKIP - initrd=/install/initrd.gz - console-setup/ask_detect=false" + noapic + preseed/url=%s + debian-installer=en_US + auto=true + locale=en_US + hostname=osbash + fb=false + debconf/frontend=noninteractive + keyboard-configuration/modelcode=SKIP + initrd=/install/initrd.gz + console-setup/ask_detect=false" function vbox_distro_start_installer { local vm_name=$1 diff --git a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 index c0a122c2..a2c6b965 100644 --- a/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 +++ b/labs/lib/osbash/lib.ubuntu-14.04-server-amd64 @@ -15,17 +15,17 @@ readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-guides/plain readonly _PS_all=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-all-v2.cfg readonly _BOOT_ARGS="/install/vmlinuz - noapic - preseed/url=%s - debian-installer=en_US - auto=true - locale=en_US - hostname=osbash - fb=false - debconf/frontend=noninteractive - keyboard-configuration/modelcode=SKIP - initrd=/install/initrd.gz - console-setup/ask_detect=false" + noapic + preseed/url=%s + debian-installer=en_US + auto=true + locale=en_US + hostname=osbash + fb=false + debconf/frontend=noninteractive + keyboard-configuration/modelcode=SKIP + initrd=/install/initrd.gz + console-setup/ask_detect=false" function vbox_distro_start_installer { local vm_name=$1 diff --git a/labs/lib/osbash/virtualbox.install_base b/labs/lib/osbash/virtualbox.install_base index 0710d349..effae708 100644 --- a/labs/lib/osbash/virtualbox.install_base +++ b/labs/lib/osbash/virtualbox.install_base @@ -5,11 +5,11 @@ function check_md5 { local csum=$2 local md5exe if ! md5exe=$(which md5sum); then - # On Mac OS X, the tool is called md5 - if ! md5exe=$(which md5); then - echo >&2 "Neither md5sum nor md5 found. Aborting." - exit 1 - fi + # On Mac OS X, the tool is called md5 + if ! md5exe=$(which md5); then + echo >&2 "Neither md5sum nor md5 found. Aborting." + exit 1 + fi fi echo >&2 -n "Verifying ISO image MD5 checksum: " if $md5exe "$file" | grep -q "$csum"; then diff --git a/labs/osbash.sh b/labs/osbash.sh index c44715ef..48958d25 100755 --- a/labs/osbash.sh +++ b/labs/osbash.sh @@ -24,7 +24,7 @@ source "$LIB_DIR/osbash/lib.color" function usage { echo "Usage: $0 {-b|-w} [-g GUI] [--no-color] [-n] {basedisk|NODE [NODE..]}" # Don't advertise export until it is working properly - #echo " $0 [-e EXPORT] [-n] NODE [NODE..]" + # echo " $0 [-e EXPORT] [-n] NODE [NODE..]" echo "" echo "-h Help" echo "-n Print configuration status and exit" diff --git a/labs/scripts/config_tenant_network.sh b/labs/scripts/config_tenant_network.sh index eea61dc7..6bfb2229 100755 --- a/labs/scripts/config_tenant_network.sh +++ b/labs/scripts/config_tenant_network.sh @@ -37,5 +37,5 @@ echo "Attaching the router to the demo tenant subnet." neutron router-interface-add demo-router demo-subnet echo "Attaching the router to the external network by setting it as the" \ - "gateway." + "gateway." neutron router-gateway-set demo-router ext-net diff --git a/labs/scripts/yum_init.sh b/labs/scripts/yum_init.sh index 3fc78d39..d16860cc 100755 --- a/labs/scripts/yum_init.sh +++ b/labs/scripts/yum_init.sh @@ -13,7 +13,9 @@ exec_logfile function set_yum_proxy { local YUM_FILE=/etc/yum.conf - if [ -z "${VM_PROXY-}" ]; then return 0; fi + if [ -z "${VM_PROXY-}" ]; then + return 0; + fi echo "proxy=${VM_PROXY}" | sudo tee -a $YUM_FILE }