openstack/project-config
Code Issues Proposed changes

Respect NODEPOOL_SSH_KEY in prepare-node for dib

Browse Source 
We dont respect this parameter when building dib images.

Change-Id: I403b59f150d11bfa01875a89de777023c15d2e71
This commit is contained in:
Gregory Haynes 2015-02-18 16:11:32 -08:00
parent c5546d307a
commit 20891096e0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nodepool/elements/puppet/bin/prepare-node
View File

@ -21,6 +21,13 @@ SUDO=${SUDO:-true}
THIN=${THIN:-true} THIN=${THIN:-true}
ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false} ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
if [ -n "$NODEPOOL_SSH_KEY" ] ; then
puppet_install_users="install_users => false,
ssh_key => '$NODEPOOL_SSH_KEY',"
else
puppet_install_users=""
fi
export FACTER_in_chroot=true export FACTER_in_chroot=true
cat >/tmp/local.pp <<EOF cat >/tmp/local.pp <<EOF
Service { Service {
@ -33,9 +40,11 @@ class {'openstack_project::single_use_slave':
sudo => $SUDO, sudo => $SUDO,
thin => $THIN, thin => $THIN,
all_mysql_privs => $ALL_MYSQL_PRIVS, all_mysql_privs => $ALL_MYSQL_PRIVS,
install_resolv_conf => false install_resolv_conf => false,
$puppet_install_users
} }
EOF EOF
# Puppet doesn't return nonzero if some things fail by default. # Puppet doesn't return nonzero if some things fail by default.
# Use detailed exit codes to get that info and determine whether # Use detailed exit codes to get that info and determine whether
# the return code indicates failure. # the return code indicates failure.