openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove PUPPET_MAJ_VERSION check for unit modules

Browse Source 
The install_modules_unit.sh which is called by the
spec helper to install the modules for the unit
tests checks the PUPPET_MAJ_VERSION variable when
selecting the puppet base path.

The zuul jobs is not configured to give this env
variable so unit tests failed when using the puppet
base path for v3 which was /etc/puppet instead of
/etc/puppetlabs/code that is valid for v4 and v5.

We don't test v3 specifically so the check
should not be needed.

Change-Id: I6a9c53d58f05dfbb8646ad36d3bf5f6bad5588e1
This commit is contained in:
Tobias Urdin 2018-02-06 15:51:26 +01:00
parent 3c8f4ccd85
commit 8196a5c350
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