openstack/puppet-openstack-integration
Code Issues Proposed changes

Ensure $GEM_BIN_DIR is in $PATH

Browse Source 
This makes gem binary usage consistent (i.e, r10k) and prevents
encoutering a command not found error.

Change-Id: I3ef01274417cd88403d71af0e6216850d77cc81c
Closes-Bug: #1592113
This commit is contained in:
David Moreau-Simard 2016-06-13 14:11:46 -04:00
parent e97f31fc6b
commit 22c29c79ac
3 changed files with 3 additions and 1 deletions

2
functions

@ -9,7 +9,7 @@
# - ``SCRIPT_DIR`` must be set to script path # - ``SCRIPT_DIR`` must be set to script path
# - ``GEM_BIN_DIR`` must be set to Gem bin directory # - ``GEM_BIN_DIR`` must be set to Gem bin directory
install_external() { install_external() {
PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 ${GEM_BIN_DIR}r10k puppetfile install -v PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k puppetfile install -v
} }
# Install Puppet OpenStack modules with zuul-cloner # Install Puppet OpenStack modules with zuul-cloner

1
install_modules.sh

@ -4,6 +4,7 @@ set -ex
if [ -n "${GEM_HOME}" ]; then if [ -n "${GEM_HOME}" ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/ GEM_BIN_DIR=${GEM_HOME}/bin/
export PATH=${PATH}:${GEM_BIN_DIR}
fi fi
if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then

1
install_modules_unit.sh

@ -8,6 +8,7 @@ set -ex
if [ -n "${GEM_HOME}" ]; then if [ -n "${GEM_HOME}" ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/ GEM_BIN_DIR=${GEM_HOME}/bin/
export PATH=${PATH}:${GEM_BIN_DIR}
fi fi
if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then