1 From f6d38d1003cdab21626f93c83bd94305881fb4c6 Mon Sep 17 00:00:00 2001
2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
3 Date: Fri, 6 Mar 2020 22:52:19 -0800
4 Subject: [PATCH] stx.3.0 rebase: adjust path
7 puppet-manifests/src/bin/puppet-manifest-apply.sh | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
10 diff --git a/puppet-manifests/src/bin/puppet-manifest-apply.sh b/puppet-manifests/src/bin/puppet-manifest-apply.sh
11 index 95e9958..4d36059 100755
12 --- a/puppet-manifests/src/bin/puppet-manifest-apply.sh
13 +++ b/puppet-manifests/src/bin/puppet-manifest-apply.sh
14 @@ -98,7 +98,7 @@ export STDLIB_LOG_DEPRECATIONS=false
16 echo "Applying puppet ${MANIFEST} manifest..."
17 flock /var/run/puppet.lock \
18 - puppet apply --debug --trace --modulepath ${PUPPET_MODULES_PATH} ${PUPPET_MANIFEST} \
19 + puppet apply --hiera_config=/etc/puppet/hiera.yaml --debug --trace --modulepath ${PUPPET_MODULES_PATH} ${PUPPET_MANIFEST} \
20 < /dev/null 2>&1 | awk ' { system("date -u +%FT%T.%3N | tr \"\n\" \" \""); print $0; fflush(); } ' > ${LOGFILE}