summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/clean.sh2
-rwxr-xr-xci/deploy.sh18
2 files changed, 6 insertions, 14 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
index 7fad2ef1..acae615d 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -10,7 +10,7 @@ virsh destroy instack 2> /dev/null || echo -n ''
virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
-for i in $(seq 0 vm_index); do
+for i in $(seq 0 $vm_index); do
virsh destroy baremetalbrbm_$i 2> /dev/null || echo -n ''
virsh undefine baremetalbrbm_$i --remove-all-storage 2> /dev/null || echo -n ''
rm -f /var/lib/libvirt/images/baremetalbrbm_${i}.qcow2 2> /dev/null
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 251fc72e..153ce339 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -283,8 +283,8 @@ display_usage() {
echo -e "\n -c|--config : Full path of settings file to parse. Optional. Will provide a new base settings file rather than the default. Example: --config /opt/myinventory.yml \n"
echo -e "\n -r|--resources : Full path of settings file to parse. Optional. Will provide a new base settings file rather than the default. Example: --config /opt/myinventory.yml \n"
echo -e "\n -v|--virtual : Virtualize compute nodes instead of using baremetal. \n"
- echo -e "\n --ping_site : site to use to verify IP connectivity from the VM when -virtual is used. Format: -ping_site www.blah.com \n"
- echo -e "\n --floating_ip_count : number of IP address from the public range to be used for floating IP. Default is 20.\n"
+ echo -e "\n -p|--ping-site : site to use to verify IP connectivity from the VM when -virtual is used. Format: -ping_site www.blah.com \n"
+ echo -e "\n -n|--no-ha : disable High Availablility deploymnet scheme, this assumes a single controller and single compute node \n"
}
##translates the command line paramaters into variables
@@ -295,7 +295,7 @@ parse_cmdline() {
echo "Use -h to display help"
sleep 2
- while [ "$(echo $1 | cut -c1)" = "-" ]
+ while [ "${1:0:1}" = "-" ]
do
echo $1
case "$1" in
@@ -315,15 +315,11 @@ parse_cmdline() {
virtual="TRUE"
shift 1
;;
- --ping_site)
+ -p|--ping-site)
ping_site=$2
shift 2
;;
- --floating_ip_count)
- floating_ip_count=$2
- shift 2
- ;;
- -n|--no_ha )
+ -n|--no-ha )
vm_index=1
shift 1
;;
@@ -333,10 +329,6 @@ parse_cmdline() {
;;
esac
done
-
- if [ -z "$floating_ip_count" ]; then
- floating_ip_count=20
- fi
}
##END FUNCTIONS