unhardcore repo-rl
Change-Id: I735121a99e30a0e15e91f94621c2dfe3fe43862c
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index 8e7091e..dd3f14f 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -2,10 +2,9 @@
"variables": {
"user": "root",
"password": "r00tme",
- "distro": "ubuntu-14-04-x64",
"disk_size": "8000",
"images_cache": "{{ env `PACKER_IMAGES_CACHE` }}",
- "ubuntu_baseurl": "https://mirror.mirantis.com/proposed/ubuntu/",
+ "ubuntu_baseurl": "{{ env `UBUNTU_BASEURL` }}",
"saltstack_gpg": "{{ env `SALTSTACK_GPG` }}",
"saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
"do_api_token": "{{ env `DO_API_TOKEN` }}",
@@ -166,7 +165,7 @@
],
"boot_wait": "5s",
"disk_size": "{{ user `disk_size`}}",
- "output_directory": "images/{{ user `distro` }}-vbox-{{ isotime \"200601021504\" }}",
+ "output_directory": "images/{{ user `image_name`}}",
"guest_os_type": "Ubuntu_64",
"http_directory": "http",
"iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
@@ -243,7 +242,7 @@
"disk_size": "{{ user `disk_size`}}",
"disk_type_id": 4,
"vmdk_name": "{{ user `image_name`}}",
- "output_directory": "images/{{ user `distro` }}-vmware-{{ isotime \"200601021504\" }}",
+ "output_directory": "images/{{ user `image_name`}}",
"guest_os_type": "linux",
"http_directory": "http",
"iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",