openstack
/
project-config
Code Issues Proposed changes

Merge "Stop defaulting node builds to Puppet 2"

This commit is contained in:
Jenkins 2014-12-12 20:23:21 +00:00 committed by Gerrit Code Review
parent 2c7d982f58 83a1658a04
commit 40da88df75
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nodepool/elements/puppet/install.d/05-puppet
View File

@ -19,7 +19,6 @@ set -e
# Unset the download cache for this invocation to prevent bleed from build host
unset PIP_DOWNLOAD_CACHE
export PUPPET_VERSION=${PUPPET_VERSION:-'2'}
/bin/bash /opt/git/openstack-infra/system-config/install_puppet.sh
/bin/bash /opt/git/openstack-infra/system-config/install_modules.sh

2
nodepool/scripts/prepare_node.sh
View File

@ -25,8 +25,6 @@ PYPY=${PYPY:-false}
ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
export PUPPET_VERSION=${PUPPET_VERSION:-'2'}
sudo hostname $HOSTNAME
if [ -n "$HOSTNAME" ] && ! grep -q $HOSTNAME /etc/hosts ; then
echo "127.0.1.1 $HOSTNAME" | sudo tee -a /etc/hosts