From bffc38d470cb2bb0ac8180e36ac205701d9e8a93 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 8 Dec 2015 13:43:47 -0800 Subject: [PATCH] Install puppet using build_git system-config When running disk image builder use the build specific checkout of system-config to install puppet and puppet modules. This allows for easy local testing of changes to those scripts. Without it master is always used. Change-Id: Ifc86d77f702633d630adc1ee619f58607cb56c82 --- nodepool/elements/puppet/install.d/05-puppet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nodepool/elements/puppet/install.d/05-puppet b/nodepool/elements/puppet/install.d/05-puppet index cfbd247a1f..29bd47c0ca 100755 --- a/nodepool/elements/puppet/install.d/05-puppet +++ b/nodepool/elements/puppet/install.d/05-puppet @@ -24,7 +24,7 @@ set -e # Unset the download cache for this invocation to prevent bleed from build host unset PIP_DOWNLOAD_CACHE -/bin/bash /opt/git/openstack-infra/system-config/install_puppet.sh -/bin/bash /opt/git/openstack-infra/system-config/install_modules.sh +/bin/bash /opt/build_git/openstack-infra/system-config/install_puppet.sh +/bin/bash /opt/build_git/openstack-infra/system-config/install_modules.sh install -m 0755 -o root -g root $(dirname $0)/../bin/prepare-node /usr/local/bin