From dc2de921c387edf0c215b33109f0b6a255f753fd Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 11 Apr 2017 18:46:54 +0200
Subject: introduce Makefile to simplify building templates

updated ubuntu/centos templates to fixed output names,
moved manifest.json to builder's subfolder,
updated README.md to reflect the changes
---
 ubuntu-16.04-amd64.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ubuntu-16.04-amd64.json')

diff --git a/ubuntu-16.04-amd64.json b/ubuntu-16.04-amd64.json
index 79276fa..67842ed 100644
--- a/ubuntu-16.04-amd64.json
+++ b/ubuntu-16.04-amd64.json
@@ -3,7 +3,7 @@
 		"iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.2-server-amd64.iso",
 		"iso_checksum": "737ae7041212c628de5751d15c3016058b0e833fdc32e7420209b76ca3d0a535",
 		"iso_checksum_type": "sha256",
-		"vm_name": "ubuntu-amd64",
+		"vm_name": "ubuntu-16.04-amd64",
 		"http_dir": "http",
 		"preseed_path": "ubuntu-16.04/preseed.cfg",
 		"shutdown_command": "systemctl poweroff",
@@ -14,7 +14,7 @@
 		"iso_url": "{{ user `iso_url` }}",
 		"iso_checksum": "{{ user `iso_checksum` }}",
 		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "qemu/output-ubuntu-amd64-{{ build_type }}-{{ timestamp }}",
+		"output_directory": "{{ build_type }}",
 		"vm_name": "{{ user `vm_name` }}",
 		"disk_size": "{{ user `disk_size` }}",
 		"format": "qcow2",
@@ -56,8 +56,8 @@
 		"iso_url": "{{ user `iso_url` }}",
 		"iso_checksum": "{{ user `iso_checksum` }}",
 		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "output-ubuntu-amd64-{{ build_type }}-{{ timestamp }}",
-		"vm_name": "packer-ubuntu-amd64",
+		"output_directory": "{{ build_type }}",
+		"vm_name": "{{ user `vm_name` }}",
 		"disk_size": "{{ user `disk_size` }}",
 		"headless": "{{ user `headless` }}",
 		"http_directory": "{{ user `http_dir` }}",
@@ -97,8 +97,8 @@
 		"iso_url": "{{ user `iso_url` }}",
 		"iso_checksum": "{{ user `iso_checksum` }}",
 		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "output-ubuntu-amd64-{{ build_type }}-{{ timestamp }}",
-		"vm_name": "packer-ubuntu-amd64",
+		"output_directory": "{{ build_type }}",
+		"vm_name": "{{ user `vm_name` }}",
 		"disk_size": "{{ user `disk_size` }}",
 		"headless": "{{ user `headless` }}",
 		"http_directory": "{{ user `http_dir` }}",
@@ -135,6 +135,6 @@
 	}],
 	"post-processors": [{
 		"type": "manifest",
-		"output": "manifest.json"
+		"output": "{{ build_type }}/manifest.json"
 	}]
 }
-- 
cgit v1.2.3-55-g7522