From baecae04600329a79984bc3e1cd54bb893a9ca91 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 10 May 2020 14:12:18 +0900
Subject: [PATCH] r10k: Replace removed env parameters by options

The environment parameters, PUPPETFILE_DIR and PUPPETFILE is no longer
valid in r10k command, so should be replaced by options, --moduledir
and --puppetfile[1].

[1] https://github.com/puppetlabs/r10k/commit/ea477d4729a7895e5f7d4ae4a41ac0f8f0eda1c9

Change-Id: I0d12f2c4efafc7a8a998d846814c94eb39927c26
---
 functions | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index efbf9cebf..03a8b9686 100644
--- a/functions
+++ b/functions
@@ -9,7 +9,9 @@
 # - ``SCRIPT_DIR`` must be set to script path
 # - ``GEM_BIN_DIR`` must be set to Gem bin directory
 install_external() {
-  PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k -v DEBUG puppetfile install
+  r10k -v DEBUG puppetfile install \
+    --puppetfile ${SCRIPT_DIR}/Puppetfile1 \
+    --moduledir ${PUPPETFILE_DIR}
 }
 
 # Install Puppet OpenStack modules from zuul checkouts
@@ -54,11 +56,14 @@ install_openstack() {
 # Install all Puppet modules with r10k
 # Uses the following variables:
 #
+# - ``PUPPETFILE_DIR`` must be set to Puppet modules directory
 # - ``SCRIPT_DIR`` must be set to script path
 install_all() {
   # When installing from local source, we want to install the current source
   # we're working from.
-  PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k -v DEBUG puppetfile install
+  r10k -v DEBUG puppetfile install \
+    --puppetfile ${SCRIPT_DIR}/Puppetfile1 \
+    --moduledir ${PUPPETFILE_DIR}
   cp -a ${SCRIPT_DIR} ${PUPPETFILE_DIR}/openstack_integration
 }