Re-align packer templates with upstream
common-packer co-opted a variable that was in use in local templates and
therefore is causing verification errors when the matrix validate
happens.
Change-Id: Ia0232836ddcda114409b2fc71705c5c4e97d90a0
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index da6f271..48b02c6 100644
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -6,9 +6,10 @@
"source_ami_filter_name": null,
"source_ami_filter_owner": null,
"subnet_id": null,
- "cloud_user": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_user": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
@@ -27,7 +28,7 @@
"most_recent": true,
"owners": ["{{user `source_ami_filter_owner`}}"]
},
- "ssh_username": "{{user `cloud_user`}}",
+ "ssh_username": "{{user `ssh_user`}}",
"subnet_id": "{{user `subnet_id`}}",
"type": "amazon-ebs",
"user_data_file": "{{user `cloud_user_data`}}"
diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
index 532e15a..3972d54 100644
--- a/packer/templates/baseline.json
+++ b/packer/templates/baseline.json
@@ -6,7 +6,6 @@
"source_ami_filter_name": null,
"source_ami_filter_owner": null,
"subnet_id": null,
- "cloud_user": null,
"distro": null,
"cloud_user_data": null
},
@@ -27,7 +26,7 @@
"most_recent": true,
"owners": ["{{user `source_ami_filter_owner`}}"]
},
- "ssh_username": "{{user `cloud_user`}}",
+ "ssh_username": "{{user `ssh_user`}}",
"subnet_id": "{{user `subnet_id`}}",
"type": "amazon-ebs",
"user_data_file": "{{user `cloud_user_data`}}"
diff --git a/packer/vars/centos-7.json b/packer/vars/centos-7.json
index fefd0aa..5e6d1c8 100644
--- a/packer/vars/centos-7.json
+++ b/packer/vars/centos-7.json
@@ -1,7 +1,7 @@
{
"source_ami_filter_name": "*CentOS Linux 7*HVM*",
"source_ami_filter_owner": "679593333241",
- "cloud_user": "centos",
+ "ssh_user": "centos",
"distro": "CentOS 7",
"cloud_user_data": "provision/rh-user_data.sh"
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index 94b2014..b0e9132 100644
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,7 +1,7 @@
{
"source_ami_filter_name": "*ubuntu*16.04*",
"source_ami_filter_owner": "099720109477",
- "cloud_user": "ubuntu",
+ "ssh_user": "ubuntu",
"distro": "Ubuntu 16.04",
"cloud_user_data": "provision/null_data.sh"