Stop defaulting node builds to Puppet 2
We're done with the Puppet 2-to-3 migration, so we no longer need to explicitly override the puppet version to 2 when bootstrapping. Change-Id: Ib04e8dda5050ae0138fba248ff28f35819fdf254
This commit is contained in:
parent
aa6c2fc0f2
commit
83a1658a04
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue