diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2018-03-27 22:46:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-27 22:46:20 +0000 |
| commit | adf5f2a92b202ea145a8a1cc62b46059e77f91fc (patch) | |
| tree | be7ece637b224aa269fea53b565ad20941a11f39 /packer/vars | |
| parent | 63d904f1d1289eab3aad54daed5a14bab9381228 (diff) | |
| parent | 564913e994d87f58475d4ebf447b4773dd09eca5 (diff) | |
Merge "Upgrade to common-packer"
Diffstat (limited to 'packer/vars')
| -rw-r--r-- | packer/vars/centos.json | 2 | ||||
| -rw-r--r-- | packer/vars/cloud-env.json.example | 1 | ||||
| -rw-r--r-- | packer/vars/ubuntu-14.04.json | 2 | ||||
| -rw-r--r-- | packer/vars/ubuntu-16.04.json | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/packer/vars/centos.json b/packer/vars/centos.json index c5b8c79f2..366202c7a 100644 --- a/packer/vars/centos.json +++ b/packer/vars/centos.json @@ -1,6 +1,6 @@ { "base_image": "CentOS 7.1611 (2017-01-30) - LF upload", - "cloud_user": "centos", + "ssh_user": "centos", "distro": "CentOS 7", "cloud_user_data": "provision/rh-user_data.sh" } 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..337ee1f1c 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", "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..eadf41863 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", "distro": "Ubuntu 16.04", + "ssh_user": "ubuntu", "cloud_user_data": "provision/null_data.sh" } |