diff options
| author | Manuel Messner | 2018-02-12 13:21:30 +0100 |
|---|---|---|
| committer | Manuel Messner | 2018-02-12 13:25:26 +0100 |
| commit | 5303f2c875a23d525261afc7aac2bc88b0551dd3 (patch) | |
| tree | 4a74411adb3d19c6edc21de8afb0a04c0fb13ba9 /Makefile | |
| parent | ansible-roles: update to new revision (diff) | |
| download | packer-templates-5303f2c875a23d525261afc7aac2bc88b0551dd3.tar.gz packer-templates-5303f2c875a23d525261afc7aac2bc88b0551dd3.tar.xz packer-templates-5303f2c875a23d525261afc7aac2bc88b0551dd3.zip | |
Makefile: rename vm_name
Signed-off-by: Jonathan Bauer <jonathan.bauer@rz.uni-freiburg.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -54,7 +54,7 @@ $(BASETARGETS): $(info ** Building template '$(@D)' using '$(BUILDER)' **) $(PACKER) build -only=$(BUILDER) \ $(PACKER_OPTS) \ - -var='vm_name=$(@D)' \ + -var='vm_name=rootfs-image' \ $(@D).json @test -f output-$(@D)-$(BUILDER)/$(@D) || false @-test -d $(@D)/base && rm -rf $(@D)/base @@ -73,9 +73,9 @@ $(foreach flav, $(FLAVORS), %/$(flav)): %/base $(info ** Provisioning '$(@D)' with '$(@F)' **) $(PACKER) build -only=$(BUILDER) \ $(PACKER_OPTS) \ - -var='vm_name=$(@F)' \ -var='image_dir=$(@D)' \ -var='image_name=base/image' \ + -var='vm_name=rootfs-image' \ -var='playbook=setup-$(@F).yml' \ $(ANSIBLE_DIR)/run-playbook-only.json @test -f output-$(@D)/$(@F) || false @@ -95,9 +95,9 @@ $(BOOTTARGETS): $(info ** Generating boot files for '$(patsubst %/,%,$(dir $(@D))):$(notdir $(@D))' **) $(PACKER) build -only=$(BUILDER) \ $(PACKER_OPTS) \ - -var='vm_name=$(notdir $(@D)).tmp' \ -var='image_dir=$(patsubst %/,%,$(dir $(@D)))/$(notdir $(@D))' \ -var='image_name=image' \ + -var='vm_name=rootfs-image.tmp' \ -var='playbook=build-dracut-initramfs.yml' \ $(ANSIBLE_DIR)/run-playbook-only.json @test -f $(ANSIBLE_DIR)/boot_files/initramfs || false |