Merge "Handle the slave bare flag properly in nodepool."

modules/openstack_project/files/nodepool/scripts/prepare_node.sh

@@ -18,7 +18,7 @@
 
 HOSTNAME=$1
 SUDO=$2
-
+BARE=$3
 
 sudo hostname $HOSTNAME
 wget https://git.openstack.org/cgit/openstack-infra/config/plain/install_puppet.sh
@@ -28,10 +28,10 @@ sudo git clone https://review.openstack.org/p/openstack-infra/config.git \
 sudo /bin/bash /root/config/install_modules.sh
 if [ -z "$NODEPOOL_SSH_KEY" ] ; then
     sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \
-	-e "class {'openstack_project::single_use_slave': sudo => $SUDO, }"
+	-e "class {'openstack_project::single_use_slave': sudo => $SUDO, bare => $BARE, }"
 else
     sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \
-	-e "class {'openstack_project::single_use_slave': install_users => false, sudo => $SUDO, ssh_key => '$NODEPOOL_SSH_KEY', }"
+	-e "class {'openstack_project::single_use_slave': install_users => false, sudo => $SUDO, bare => $BARE, ssh_key => '$NODEPOOL_SSH_KEY', }"
 fi
 
 sudo mkdir -p /opt/git

modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh

@@ -17,5 +17,7 @@
 # limitations under the License.
 
 HOSTNAME=$1
+SUDO='false'
+BARE='false'
 
-./prepare_node.sh "$HOSTNAME" false
+./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"

modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh

@@ -17,6 +17,8 @@
 # limitations under the License.
 
 HOSTNAME=$1
+SUDO='true'
+BARE='true'
 
-./prepare_node.sh "$HOSTNAME" true
+./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME

modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh

@@ -17,6 +17,8 @@
 # limitations under the License.
 
 HOSTNAME=$1
+SUDO='true'
+BARE='true'
 
-./prepare_node.sh "$HOSTNAME" true
+./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME

modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh

@@ -17,8 +17,10 @@
 # limitations under the License.
 
 HOSTNAME=$1
+SUDO='true'
+BARE='true'
 
 # Workaround bug 1270646 during node bootstrapping.
 sudo ip link set mtu 1458 dev eth0
-./prepare_node.sh "$HOSTNAME" true
+./prepare_node.sh "$HOSTNAME" "$SUDO" "$BARE"
 sudo -u jenkins -i /opt/nodepool-scripts/prepare_tripleo.sh $HOSTNAME

modules/openstack_project/manifests/single_use_slave.pp

@@ -10,6 +10,7 @@ class openstack_project::single_use_slave (
   $certname = $::fqdn,
   $install_users = true,
   $sudo = false,
+  $bare = true,
   $automatic_upgrades = false,
   $ssh_key = $openstack_project::jenkins_ssh_key
 ) inherits openstack_project {
@@ -25,6 +26,6 @@ class openstack_project::single_use_slave (
   class { 'jenkins::slave':
     ssh_key => $ssh_key,
     sudo    => $sudo,
-    bare    => true,
+    bare    => $bare,
   }
 }