install_modules: export PUPPET_BASE_PATH
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:
parent
b70cfae9a9
commit
cf864be1bc
|
@ -6,6 +6,12 @@ if [ ! -z ${GEM_HOME} ]; then
|
||||||
GEM_BIN_DIR=${GEM_HOME}/bin/
|
GEM_BIN_DIR=${GEM_HOME}/bin/
|
||||||
fi
|
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 SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||||
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
|
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
|
||||||
source $SCRIPT_DIR/functions
|
source $SCRIPT_DIR/functions
|
||||||
|
|
|
@ -10,6 +10,12 @@ if [ ! -z ${GEM_HOME} ]; then
|
||||||
GEM_BIN_DIR=${GEM_HOME}/bin/
|
GEM_BIN_DIR=${GEM_HOME}/bin/
|
||||||
fi
|
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 SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||||
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
|
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
|
||||||
source $SCRIPT_DIR/functions
|
source $SCRIPT_DIR/functions
|
||||||
|
|
Loading…
Reference in New Issue