summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packer/templates/basebuild.json5
-rw-r--r--packer/templates/docker.json5
-rw-r--r--packer/vars/centos.json1
-rw-r--r--packer/vars/ubuntu-14.04.json1
-rw-r--r--packer/vars/ubuntu-16.04.json1
5 files changed, 6 insertions, 7 deletions
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index 426f290af..ff84a72d6 100644
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -4,7 +4,6 @@
"stack_user": null,
"stack_pass": null,
"stack_network": null,
-
"base_image": null,
"cloud_user": null,
"distro": null,
@@ -32,7 +31,9 @@
"provisioners": [
{
"type": "shell",
- "inline": ["mkdir -p /tmp/packer"]
+ "inline": [
+ "mkdir -p /tmp/packer"
+ ]
},
{
"type": "file",
diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index 5418c4b02..1c8d3ec56 100644
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -4,7 +4,6 @@
"stack_user": null,
"stack_pass": null,
"stack_network": null,
-
"base_image": null,
"cloud_user": null,
"distro": null,
@@ -32,7 +31,9 @@
"provisioners": [
{
"type": "shell",
- "inline": ["mkdir -p /tmp/packer"]
+ "inline": [
+ "mkdir -p /tmp/packer"
+ ]
},
{
"type": "file",
diff --git a/packer/vars/centos.json b/packer/vars/centos.json
index 7516bcc87..c5b8c79f2 100644
--- a/packer/vars/centos.json
+++ b/packer/vars/centos.json
@@ -1,7 +1,6 @@
{
"base_image": "CentOS 7.1611 (2017-01-30) - LF upload",
"cloud_user": "centos",
-
"distro": "CentOS 7",
"cloud_user_data": "provision/rh-user_data.sh"
}
diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
index 938194b52..dd81e2594 100644
--- a/packer/vars/ubuntu-14.04.json
+++ b/packer/vars/ubuntu-14.04.json
@@ -1,7 +1,6 @@
{
"base_image": "Ubuntu 14.04 (2017-02-01) - LF upload",
"cloud_user": "ubuntu",
-
"distro": "Ubuntu 14.04",
"cloud_user_data": "provision/null_data.sh"
}
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index c45de861e..12f9430ed 100644
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,7 +1,6 @@
{
"base_image": "Ubuntu 16.04 (2017-02-01) - LF upload",
"cloud_user": "ubuntu",
-
"distro": "Ubuntu 16.04",
"cloud_user_data": "provision/null_data.sh"
}