openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Rename PUPPET_VERSION to PUPPET_MAJ_VERSION 

PUPPET_VERSION is already used by puppetlabs/beaker and we don't want to
overlap with this variable. So let's rename it to PUPPET_MAJ_VERSION to
avoid strange behaviors when running Beaker jobs.

Change-Id: I74be2eec2be53f59af196f37ee348ff6856af8bc
This commit is contained in:
Emilien Macchi 2016-06-07 17:58:23 -04:00
parent 5a9364ecd0
commit ad5546a400
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_modules.sh
View File

@ -6,7 +6,7 @@ if [ -n "${GEM_HOME}" ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
if [ "${PUPPET_VERSION}" = 4 ]; then
if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then
export PUPPET_BASE_PATH=/etc/puppetlabs/code
export PATH=${PATH}:/opt/puppetlabs/bin
else

2
install_modules_unit.sh
View File

@ -10,7 +10,7 @@ if [ -n "${GEM_HOME}" ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
if [ "${PUPPET_VERSION}" = 4 ]; then
if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then
export PUPPET_BASE_PATH=/etc/puppetlabs/code
else
export PUPPET_BASE_PATH=/etc/puppet

6
run_tests.sh
View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
export PUPPET_VERSION=${PUPPET_VERSION:-3}
export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-3}
export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
export MANAGE_REPOS=${MANAGE_REPOS:-true}
@ -21,7 +21,7 @@ export PUPPET_ARGS=${PUPPET_ARGS:-}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export DISTRO=$(lsb_release -c -s)
if [ $PUPPET_VERSION == 4 ]; then
if [ $PUPPET_MAJ_VERSION == 4 ]; then
export PATH=${PATH}:/opt/puppetlabs/bin
export PUPPET_RELEASE_FILE=puppetlabs-release-pc1
export PUPPET_BASE_PATH=/etc/puppetlabs/code
@ -66,7 +66,7 @@ if uses_debs; then
# Puppetlabs packaging:
# - trusty: puppet3 and puppet4
# - xenial: puppet4 only
if [[ ${DISTRO} == "trusty" ]] || [[ ${DISTRO} == "xenial" && ${PUPPET_VERSION} == 4 ]]; then
if [[ ${DISTRO} == "trusty" ]] || [[ ${DISTRO} == "xenial" && ${PUPPET_MAJ_VERSION} == 4 ]]; then
if dpkg -l $PUPPET_RELEASE_FILE >/dev/null 2>&1; then
$SUDO apt-get purge -y $PUPPET_RELEASE_FILE
fi