diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-18 12:16:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-18 12:16:54 +0000 |
| commit | 537b0ad32bcdcd4b7a6c6fec7f7b2d69560d4405 (patch) | |
| tree | af51931e08429def3973038228a984cf0669f891 /dev/vagrant/bootstrap.sh | |
| parent | 4cddefe7d77166b3b328862821e392f87d55ba97 (diff) | |
| parent | 70074abd07a81b1b932bc0de084bc5d456348f57 (diff) | |
| download | kolla-537b0ad32bcdcd4b7a6c6fec7f7b2d69560d4405.tar.gz kolla-537b0ad32bcdcd4b7a6c6fec7f7b2d69560d4405.zip | |
Merge "Make vagrant bootstrap scripts args more obvious"
Diffstat (limited to 'dev/vagrant/bootstrap.sh')
| -rw-r--r-- | dev/vagrant/bootstrap.sh | 10 |
1 files changed, 7 insertions, 3 deletions
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 |