openstack/puppet-openstack-integration
Code Issues Proposed changes

install_modules: export PUPPET_BASE_PATH

Browse Source 
We need to export PUPPET_BASE_PATH otherwise beaker & unit CI jobs will
fail to copy modules in the right path:
mv /modules/openstack-integration /modules/openstack_integration

Change-Id: I1c99de3f99367fb7677977fee4c5cf08afda5977
This commit is contained in:
Emilien Macchi 2016-03-22 21:31:18 -04:00
parent b70cfae9a9
commit cf864be1bc
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_modules.sh
View File

@ -6,6 +6,12 @@ if [ ! -z ${GEM_HOME} ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
if [ $PUPPET_VERSION == 4 ]; then
export PUPPET_BASE_PATH=/etc/puppetlabs/code
else
export PUPPET_BASE_PATH=/etc/puppet
fi
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
source $SCRIPT_DIR/functions

6
install_modules_unit.sh
View File

@ -10,6 +10,12 @@ if [ ! -z ${GEM_HOME} ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
if [ $PUPPET_VERSION == 4 ]; then
export PUPPET_BASE_PATH=/etc/puppetlabs/code
else
export PUPPET_BASE_PATH=/etc/puppet
fi
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
source $SCRIPT_DIR/functions