openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Additional path for puppetlabs 

In newer versions of the puppetlabs provided puppet-agent, some of the
tooling has been moved to /opt/puppetlabs/puppet/bin. We need to include
this so that things like gem contianue to work.

Change-Id: I4296ed611830af581d64777377c87a51230241dc
This commit is contained in:
Alex Schultz 2017-04-18 11:06:04 -06:00
parent 388a029604
commit 6f82b7ba10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_modules.sh
View File

@ -14,7 +14,7 @@ if [ "${PUPPET_MAJ_VERSION}" = 3 ]; then
export PUPPET_BASE_PATH=/etc/puppet
else
export PUPPET_BASE_PATH=/etc/puppetlabs/code
export PATH=${PATH}:/opt/puppetlabs/bin
export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
# Workaround to deploy puppet for beaker jobs
sudo -E ln -sfn /opt/puppetlabs/bin/puppet /usr/sbin/puppet
fi

2
run_tests.sh
View File

@ -67,7 +67,7 @@ export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
export FACTER_rdo_mirror_host=$RDO_MIRROR_HOST
if [ $PUPPET_MAJ_VERSION == 4 ]; then
export PATH=${PATH}:/opt/puppetlabs/bin
export PATH=${PATH}:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin
export PUPPET_RELEASE_FILE=puppetlabs-release-pc1
export PUPPET_BASE_PATH=/etc/puppetlabs/code
export PUPPET_PKG=puppet-agent