From 6168de161f031c9c7bcb5de3965f3f629b6ec6ed Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Fri, 15 Jun 2018 11:09:43 +0200
Subject: [PATCH] Fix acceptance test setup script for puppet 4

Map the modules to the correct path depending on whether this is running
under puppet 4. Currently, acceptance tests for puppet 4 will always
explicitly set PUPPET_VERSION.

Also clean up an unused variable to avoid confusion.

Change-Id: I9bd36a277411c72ef77ce157f8364845acc2e923
---
 tools/install_modules_acceptance.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/install_modules_acceptance.sh b/tools/install_modules_acceptance.sh
index f48591414c..69463c6911 100755
--- a/tools/install_modules_acceptance.sh
+++ b/tools/install_modules_acceptance.sh
@@ -27,7 +27,6 @@
 # in a zuul environment or not.
 
 ROOT=$(readlink -fn $(dirname $0)/..)
-MODULE_PATH="${ROOT}/modules:/etc/puppet/modules"
 
 # These arrays are initialized here and populated in modules.env
 
@@ -47,12 +46,19 @@ install_external() {
 }
 
 install_openstack() {
+    local modulepath
+    if [ "$PUPPET_VERSION" == "3" ] ; then
+        modulepath='/etc/puppet/modules'
+    else
+        modulepath='/etc/puppetlabs/code/modules'
+    fi
+
     cat > clonemap.yaml <<EOF
 clonemap:
   - name: openstack-infra/project-config
     dest: /etc/project-config
   - name: '(.*?)/puppet-(.*)'
-    dest: '/etc/puppet/modules/\2'
+    dest: '$modulepath/\2'
 EOF
 
     project_names=""