From 6d5803d05a6e308e3c315c2689f1cec031d21fad Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 4 Jan 2017 16:38:33 -0700
Subject: [PATCH] Fix beaker under centos

beaker-puppet_install_helper 0.6.0 has made the PUPPET_INSTALL_TYPE now
default to agent which was the previous behavior we had when running
under puppet 4. Since puppet 3 is now officially EOL, this switches the
defaut to assume puppet agent packaging rather than the foss version.

Change-Id: I3243f9d7bdb19840f6462c5b6b237c2314a71fbe
---
 install_modules.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install_modules.sh b/install_modules.sh
index 2beb5ecce..f4b8c6f90 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -7,13 +7,16 @@ if [ -n "${GEM_HOME}" ]; then
     export PATH=${PATH}:${GEM_BIN_DIR}
 fi
 
-if [ "${PUPPET_MAJ_VERSION}" = 4 ]; then
+# NOTE(aschultz): since puppet 3 is now EOL, and beaker-puppet_install_helper
+# version 0.6.0 has made the agent version the default, we need to symlink
+# puppet to the /opt/puppetlabs version when specifically not version 3.
+if [ "${PUPPET_MAJ_VERSION}" = 3 ]; then
+  export PUPPET_BASE_PATH=/etc/puppet
+else
   export PUPPET_BASE_PATH=/etc/puppetlabs/code
   export PATH=${PATH}:/opt/puppetlabs/bin
   # Workaround to deploy puppet for beaker jobs
   sudo -E ln -sfn /opt/puppetlabs/bin/puppet /usr/sbin/puppet
-else
-  export PUPPET_BASE_PATH=/etc/puppet
 fi
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)