From cf6a377977ee2ed2cd081b395cc49e35ef691e65 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 23 Sep 2015 10:01:35 -0400
Subject: [PATCH] install_modules: allow to customize PUPPETFILE_DIR

Allow to change PUPPETFILE_DIR but keep '/etc/puppet/modules' by
default.

Change-Id: Ie32d18d477c271b2724290edbbfd4ae7ea110480
---
 install_modules.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_modules.sh b/install_modules.sh
index daedf4307..c2aace3e4 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -7,7 +7,7 @@ if [ ! -z ${GEM_HOME} ]; then
 fi
 
 export SCRIPT_DIR=$(readlink -f "$(dirname $0)")
-export PUPPETFILE_DIR=/etc/puppet/modules
+export PUPPETFILE_DIR=${PUPPETFILE_DIR:-/etc/puppet/modules}
 
 install_external() {
   PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 ${GEM_BIN_DIR}r10k puppetfile install -v
@@ -17,7 +17,7 @@ install_openstack() {
   cat > clonemap.yaml <<EOF
 clonemap:
   - name: '(.*?)/puppet-(.*)'
-    dest: '/etc/puppet/modules/\2'
+    dest: '$PUPPETFILE_DIR/\2'
 EOF
 
   local project_names=$(awk '{ if ($1 == ":git") print $3 }' \