Merge "move network id to local jenkins configuration managed files"

diff --git a/packer/vars/centos.json b/packer/vars/centos.json
index 06754edaf9b707278639713120c88ac50211193d..5602797b11bae85c63de2b0f24243b96c16b9396 100644 (file)
--- a/packer/vars/centos.json
+++ b/packer/vars/centos.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "CentOS 7 (PVHVM)",
-  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
   "public_cloud_user": "root",
 
   "private_base_image": "CentOS 7 (cloudimg 1510)",
-  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
   "private_cloud_user": "centos",
 
   "distro": "CentOS 7",

diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
index 6c10f8c4a25cddeadaff7270df64330173491394..fbdb0750f29115e595f6ccf260260d4ac0fe5912 100644 (file)
--- a/packer/vars/cloud-env.json.example
+++ b/packer/vars/cloud-env.json.example
@@ -4,11 +4,12 @@
   "public_tenant": "TENNANTID",
   "public_user": "USERID",
   "public_pass": "USERPASS",
-
+  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
 
   "private_auth_url": "https://privapi.opendaylight.org:5000/v2.0",
 
   "private_tenant": "TENNANTID",
   "private_user": "USERID",
-  "private_pass": "USERPASS"
+  "private_pass": "USERPASS",
+  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2"
 }

diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
index 7902b6b9b4d48a6e9aa753ae5aae936377c22bad..846ab9b229c429f4d58fdddf6d529a64ae09a61a 100644 (file)
--- a/packer/vars/ubuntu-14.04.json
+++ b/packer/vars/ubuntu-14.04.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
-  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
   "public_cloud_user": "root",
 
   "private_base_image": "Ubuntu 14.04 LTS Trusty Tahr (cloudimg)",
-  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
   "private_cloud_user": "ubuntu",
 
   "distro": "Ubuntu 14.04",

diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index d01b773b81bc6ea46b51a8aeb9c41f609f764359..ae1154b44af6b7c15114106655a4afb6347cac68 100644 (file)
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
-  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
   "public_cloud_user": "root",
 
   "private_base_image": "Ubuntu 16.04 LTS (2016-05-03 cloudimg)",
-  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2",
   "private_cloud_user": "ubuntu",
 
   "distro": "Ubuntu 16.04",