From 74db309b78c6068b97d567c049ba463cfc559d2d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 5 Feb 2014 17:17:13 -0800 Subject: [PATCH] Be explicit about node_prepare.sh args. If $HOSTNAME is not set when calling prepare_node.sh then SUDO value could be confused for the hostname. Quote $HOSTNAME so it is clear which arg belongs to each arg position in prepare_node.sh. Change-Id: I9efffa5225de618b57980c1d60da24d7904cd91b --- .../files/nodepool/scripts/prepare_node_bare.sh | 2 +- .../files/nodepool/scripts/prepare_node_devstack.sh | 2 +- .../files/nodepool/scripts/prepare_node_devstack_new_kernel.sh | 2 +- .../files/nodepool/scripts/prepare_node_tripleo.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 7209a309b0..6e2513fe39 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh @@ -18,4 +18,4 @@ HOSTNAME=$1 -./prepare_node.sh $HOSTNAME false +./prepare_node.sh "$HOSTNAME" false 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 9fef2b36cc..9ea9d6a5bf 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh @@ -18,5 +18,5 @@ HOSTNAME=$1 -./prepare_node.sh $HOSTNAME true +./prepare_node.sh "$HOSTNAME" true sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME 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 09a1b225a3..3c0efb8a48 100644 --- 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 @@ -18,5 +18,5 @@ HOSTNAME=$1 -./prepare_node.sh $HOSTNAME +./prepare_node.sh "$HOSTNAME" true sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME 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 f109a5efc2..45b0ee99c9 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh @@ -20,5 +20,5 @@ HOSTNAME=$1 # Workaround bug 1270646 during node bootstrapping. sudo ip link set mtu 1458 dev eth0 -./prepare_node.sh $HOSTNAME true +./prepare_node.sh "$HOSTNAME" true sudo -u jenkins -i /opt/nodepool-scripts/prepare_tripleo.sh $HOSTNAME