openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove PUPPET_MAJ_VERSION check for unit modules"

Browse Source
This commit is contained in:
Zuul 2018-02-27 13:24:47 +00:00 committed by Gerrit Code Review
commit b4c3df5a02
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install_modules_unit.sh
View File

@ -11,12 +11,7 @@ if [ -n "${GEM_HOME}" ]; then
export PATH=${PATH}:${GEM_BIN_DIR}
fi
if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then
export PUPPET_BASE_PATH=/etc/puppetlabs/code
else
export PUPPET_BASE_PATH=/etc/puppet
fi
export PUPPET_BASE_PATH=/etc/puppetlabs/code
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules}
source $SCRIPT_DIR/functions