aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-04 11:55:42 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-04 11:55:42 -0300
commitdad616343a9a8fcaec4b25a87c66a3ae725a11f1 (patch)
treeb24d40a90107651bf91ee4cddf5526c79118b82d /Makefile
parent71e2d679d6757b9f7b6680468c4c6d6e3c42dcc6 (diff)
downloadpuppet-bootstrap-dad616343a9a8fcaec4b25a87c66a3ae725a11f1.tar.gz
puppet-bootstrap-dad616343a9a8fcaec4b25a87c66a3ae725a11f1.tar.bz2
Hiera suport at config target
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4b491a7..b50f868 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,10 @@ remote:
git remote add bootstrap $(REPO)
config:
- FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --hiera-config=hiera.yaml --modulepath=modules manifests/classes/configurator.pp
+ FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/classes/configurator.pp
apply:
- FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --hiera-config=hiera.yaml --modulepath=modules manifests/$(stage).pp
+ FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules manifests/$(stage).pp
clean:
rm -rf modules