summaryrefslogtreecommitdiffstats
path: root/packer/vars
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-19 13:41:33 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-20 01:08:09 +0000
commitfc206b0b14de7b7dc7048ea3500de97b9a2b55a7 (patch)
treeec5de42ce0d087aa47a38dfb0c2022196a9c8906 /packer/vars
parent4f41c69646466dd82ec7b0482f236cf1bb076639 (diff)
Upgrade to common-packer
- Enable builder.json - Relove unused provision scripts - Update ci-management-packer-jobs - Update builder.yaml Change-Id: I0c9abcd33fd3acb84690863dca966a01731dc64c Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'packer/vars')
-rw-r--r--packer/vars/cloud-env.json.example1
-rw-r--r--packer/vars/ubuntu-14.04.json4
-rw-r--r--packer/vars/ubuntu-16.04.json4
3 files changed, 5 insertions, 4 deletions
diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
index 3a2ea9d2b..451c5dab9 100644
--- a/packer/vars/cloud-env.json.example
+++ b/packer/vars/cloud-env.json.example
@@ -3,4 +3,5 @@
"stack_user": "USERID",
"stack_pass": "PASSWD",
"stack_network": "NETID",
+ "ssh_proxy_host": ""
}
diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
index dd81e2594..882d9598d 100644
--- a/packer/vars/ubuntu-14.04.json
+++ b/packer/vars/ubuntu-14.04.json
@@ -1,6 +1,6 @@
{
- "base_image": "Ubuntu 14.04 (2017-02-01) - LF upload",
- "cloud_user": "ubuntu",
+ "base_image": "LF - Ubuntu 14.04 LTS (2017-12-01)",
"distro": "Ubuntu 14.04",
+ "ssh_user": "ubuntu",
"cloud_user_data": "provision/null_data.sh"
}
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index 12f9430ed..b55f96b4b 100644
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,6 +1,6 @@
{
- "base_image": "Ubuntu 16.04 (2017-02-01) - LF upload",
- "cloud_user": "ubuntu",
+ "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
"distro": "Ubuntu 16.04",
+ "ssh_user": "ubuntu",
"cloud_user_data": "provision/null_data.sh"
}