From 70074abd07a81b1b932bc0de084bc5d456348f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Wed, 18 Nov 2015 10:23:45 +0900
Subject: [PATCH] Make vagrant bootstrap scripts args more obvious
Also add missing curly braces around variables.
TrivialFix
Change-Id: I8798ec52d9ddf76ad1f3debdf087ed4f51defc38
---
dev/vagrant/bootstrap.sh | 10 +++++++---
dev/vagrant/ubuntu-bootstrap.sh | 15 +++++++++------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index 14ea307ddd..bc3d6c2f43 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
diff --git a/dev/vagrant/ubuntu-bootstrap.sh b/dev/vagrant/ubuntu-bootstrap.sh
index 966a07a77f..04b9591d0e 100644
--- a/dev/vagrant/ubuntu-bootstrap.sh
+++ b/dev/vagrant/ubuntu-bootstrap.sh
@@ -1,8 +1,11 @@
#!/bin/bash
-kolla_path=$3
-registry=operator.local
-registry_port=4000
+VM=$1
+MODE=$2
+KOLLA_PATH=$3
+
+REGISTRY=operator.local
+REGISTRY_PORT=4000
install_ansible() {
echo "Installing Ansible"
@@ -25,7 +28,7 @@ install_docker() {
echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list
apt-get update
apt-get install -y docker-engine=1.8.2*
- sed -i -r "s,^[# ]*DOCKER_OPTS=.+$,DOCKER_OPTS=\"--insecure-registry $registry:$registry_port\"," /etc/default/docker
+ sed -i -r "s,^[# ]*DOCKER_OPTS=.+$,DOCKER_OPTS=\"--insecure-registry ${REGISTRY}:${REGISTRY_PORT}\"," /etc/default/docker
}
install_python_deps() {
@@ -47,7 +50,7 @@ create_registry() {
docker run -d \
--name registry \
--restart=always \
- -p 4000:5000 \
+ -p ${REGISTRY_PORT}:5000 \
-e STANDALONE=True \
-e MIRROR_SOURCE=https://registry-1.docker.io \
-e MIRROR_SOURCE_INDEX=https://index.docker.io \
@@ -58,7 +61,7 @@ create_registry() {
configure_kolla() {
echo "Configuring Kolla"
- pip install -r $kolla_path/requirements.txt
+ pip install -r ${KOLLA_PATH}/requirements.txt
}
echo "Kernel version $(uname -r)"