opendev/system-config
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2014-02-06 01:55:39 +00:00 committed by Gerrit Code Review
commit 2d81f1490d
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -18,7 +18,7 @@
HOSTNAME=$1 HOSTNAME=$1
SUDO=$2 SUDO=$2
BARE=$3
sudo hostname $HOSTNAME sudo hostname $HOSTNAME
wget https://git.openstack.org/cgit/openstack-infra/config/plain/install_puppet.sh 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 sudo /bin/bash /root/config/install_modules.sh
if [ -z "$NODEPOOL_SSH_KEY" ] ; then if [ -z "$NODEPOOL_SSH_KEY" ] ; then
sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \ 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 else
sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \ 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 fi
sudo mkdir -p /opt/git sudo mkdir -p /opt/git

4
modules/openstack_project/files/nodepool/scripts/prepare_node_bare.sh
View File

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

4
modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh
View File

@ -17,6 +17,8 @@
# limitations under the License. # limitations under the License.
HOSTNAME=$1 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 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME

4
modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh
View File

@ -17,6 +17,8 @@
# limitations under the License. # limitations under the License.
HOSTNAME=$1 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 sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME

4
modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
View File

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

3
modules/openstack_project/manifests/single_use_slave.pp
View File

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