summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan Bauer2018-11-13 11:56:37 +0100
committerJonathan Bauer2018-11-13 11:56:37 +0100
commit7f85a8c5d2bd4adbb13629a23427af2065fa6175 (patch)
tree9daabe91c92e89a20835f1853cd789855fc2ed29 /Makefile
parentMakefile: change default value for ANSIBLE_DIR_CORE (diff)
downloadpacker-templates-7f85a8c5d2bd4adbb13629a23427af2065fa6175.tar.gz
packer-templates-7f85a8c5d2bd4adbb13629a23427af2065fa6175.tar.xz
packer-templates-7f85a8c5d2bd4adbb13629a23427af2065fa6175.zip
Makefile: introduce ANSIBLE_PROV_EXTRA_ARGS
to pass arguments to ansible during the *provisioning* step
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 07c5778..e4e456e 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $
BOOTTARGETS := $(foreach template, $(TEMPLATES), $(template)/base/boot)
BOOTTARGETS += $(foreach prov, $(PROVTARGETS), $(prov)/boot)
+ANSIBLE_PROV_EXTRA_ARGS :=
override PACKER_OPTS += -var-file=base.json
ifdef DEBUG
@@ -153,6 +154,7 @@ $(foreach flav, $(FLAVORS), %/$(flav)): %/base
-var='output_directory=$(BUILD_DIR)/build' \
-var='base_image=$(@D)/base/rootfs-image' \
-var='playbook=$(BUILD_DIR)/$(ANSIBLE_DIR_PROV)/setup-$(@F).yml' \
+ -var='extra_ansible_args=$(ANSIBLE_PROV_EXTRA_ARGS)' \
ansible-provisioner.json