From 8bd00564430539570dba425a9e6cf5f5ac5b18b5 Mon Sep 17 00:00:00 2001
From: K Jonathan Harker <k.jonathan.harker@hp.com>
Date: Wed, 2 Jul 2014 16:45:56 -0700
Subject: [PATCH] Export prepare_node variables rather than pass them around

The prepare_node scripts are primarily called from within nodepool,
which only passes in a single argument: the hostname of the node.

The rest of the values that we want to pass in to the underlying
prepare_node script can be shared through the environment, making order
no longer important and alleviating the need to duplicate setting
defaults in order to pad positional arguments to a newly created
variable.

Change-Id: I0a13e27524b75a50a482870414ebe2fd6ac8315e
---
 .../files/nodepool/scripts/prepare_node.sh          | 13 +++++++------
 .../files/nodepool/scripts/prepare_node_bare.sh     | 13 +++++++------
 .../files/nodepool/scripts/prepare_node_devstack.sh |  9 +++++----
 .../scripts/prepare_node_devstack_new_kernel.sh     |  9 +++++----
 .../files/nodepool/scripts/prepare_node_py3k.sh     | 13 +++++++------
 .../files/nodepool/scripts/prepare_node_tripleo.sh  |  9 +++++----
 6 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
index 1eb4536618..32d1488b55 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
@@ -17,12 +17,13 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO=$2
-THIN=$3
-PYTHON3=${4:-false}
-PYPY=${5:-false}
-ALL_MYSQL_PRIVS=${6:-false}
-GIT_BASE=${7:-git://git.openstack.org}
+
+SUDO=${SUDO:-true}
+THIN=${THIN:-true}
+PYTHON3=${PYTHON3:-false}
+PYPY=${PYPY:-false}
+ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
+GIT_BASE=${GIT_BASE:-git://git.openstack.org}
 
 # Save the nameservers configured by our provider.
 cat >/tmp/forwarding.conf <<EOF
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
index c41ae01772..55d035f481 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
@@ -17,12 +17,13 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO='true'
-THIN='false'
-PYTHON3='false'
-PYPY='false'
-ALL_MYSQL_PRIVS='true'
 
-./prepare_node.sh "$HOSTNAME" "$SUDO" "$THIN" "$PYTHON3" "$PYPY" "$ALL_MYSQL_PRIVS"
+export SUDO='true'
+export THIN='false'
+export PYTHON='false'
+export PYPY='false'
+export ALL_MYSQL_PRIVS='true'
+
+./prepare_node.sh "$HOSTNAME"
 
 ./restrict_memory.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
index 45c1e885fd..7314c6169f 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
@@ -17,10 +17,11 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO='true'
-THIN='true'
 
-./prepare_node.sh "$HOSTNAME" "$SUDO" "$THIN"
-sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME
+export SUDO='true'
+export THIN='true'
+
+./prepare_node.sh "$HOSTNAME"
+sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh "$HOSTNAME"
 
 ./restrict_memory.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
index c2496ab09c..f00cf5ae9d 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
@@ -17,10 +17,11 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO='true'
-THIN='true'
 
-./prepare_node.sh "$HOSTNAME" "$SUDO" "$THIN"
-sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME
+export SUDO='true'
+export THIN='true'
+
+./prepare_node.sh "$HOSTNAME"
+sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh "$HOSTNAME"
 
 ./restrict_memory.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh
index 9b8be24cbb..6a00d49f43 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_py3k.sh
@@ -17,12 +17,13 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO='false'
-THIN='false'
-PYTHON3='true'
-PYPY='true'
-ALL_MYSQL_PRIVS='true'
 
-./prepare_node.sh "$HOSTNAME" "$SUDO" "$THIN" "$PYTHON3" "$PYPY" "$ALL_MYSQL_PRIVS"
+export SUDO='false'
+export THIN='false'
+export PYTHON3='true'
+export PYPY='true'
+export ALL_MYSQL_PRIVS='true'
+
+./prepare_node.sh "$HOSTNAME"
 ./fix_pip.sh
 ./restrict_memory.sh
diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
index a6827db93b..b5315b4cde 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
@@ -17,13 +17,14 @@
 # limitations under the License.
 
 HOSTNAME=$1
-SUDO='true'
-THIN='true'
+
+export SUDO='true'
+export THIN='true'
 
 # Workaround bug 1270646 during node bootstrapping.
 sudo ip link set mtu 1458 dev eth0
-./prepare_node.sh "$HOSTNAME" "$SUDO" "$THIN"
-sudo -u jenkins -i /opt/nodepool-scripts/prepare_tripleo.sh $HOSTNAME
+./prepare_node.sh "$HOSTNAME"
+sudo -u jenkins -i /opt/nodepool-scripts/prepare_tripleo.sh "$HOSTNAME"
 
 sync
 sleep 5