From 83a1658a0463857594e57183f22837fa309314fe Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 12 Dec 2014 15:24:01 +0000 Subject: [PATCH] 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 --- nodepool/elements/puppet/install.d/05-puppet | 1 - nodepool/scripts/prepare_node.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/nodepool/elements/puppet/install.d/05-puppet b/nodepool/elements/puppet/install.d/05-puppet index dd99d93131..493163e88d 100755 --- a/nodepool/elements/puppet/install.d/05-puppet +++ b/nodepool/elements/puppet/install.d/05-puppet @@ -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 diff --git a/nodepool/scripts/prepare_node.sh b/nodepool/scripts/prepare_node.sh index 966cd2e38f..cdbe07c984 100755 --- a/nodepool/scripts/prepare_node.sh +++ b/nodepool/scripts/prepare_node.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