From 70074abd07a81b1b932bc0de084bc5d456348f57 Mon Sep 17 00:00:00 2001
From: Martin André <m.andre@redhat.com>
Date: Wed, 18 Nov 2015 10:23:45 +0900
Subject: Make vagrant bootstrap scripts args more obvious

Also add missing curly braces around variables.

TrivialFix

Change-Id: I8798ec52d9ddf76ad1f3debdf087ed4f51defc38
---
 dev/vagrant/bootstrap.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'dev/vagrant/bootstrap.sh')

diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index 14ea307dd..bc3d6c2f4 100644
--- a/dev/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh
@@ -3,10 +3,14 @@
 # Bootstrap script to configure all nodes.
 #
 
+VM=$1
+MODE=$2
+KOLLA_PATH=$3
+
 export http_proxy=
 export https_proxy=
 
-if [ $2 = 'aio' ]; then
+if [ "$MODE" = 'aio' ]; then
     # Run registry on port 4000 since it may collide with keystone when doing AIO
     REGISTRY_PORT=4000
     SUPPORT_NODE=operator
@@ -123,7 +127,7 @@ EOF
         docker run -d \
             --name registry \
             --restart=always \
-            -p $REGISTRY_PORT:5000 \
+            -p ${REGISTRY_PORT}:5000 \
             -e STANDALONE=True \
             -e MIRROR_SOURCE=https://registry-1.docker.io \
             -e MIRROR_SOURCE_INDEX=https://index.docker.io \
@@ -136,6 +140,6 @@ EOF
 prep_work
 install_docker
 
-if [ "$1" = "operator" ]; then
+if [ "$VM" = "operator" ]; then
     configure_operator
 fi
-- 
cgit v1.2.3