From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 31 Oct 2018 22:48:11 +0000 (-0400)
Subject: Remove packer config now available in clouds.yaml
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f49ee8606fb27fde12e85eef676e6ca5942696c4;p=releng%2Fbuilder.git

Remove packer config now available in clouds.yaml

With packer 1.2.5 it can pull config directly from openstack
client's clouds.yaml file so remove the now redundent credential
information from cloud-env.

Change-Id: Idaff5c01db868450930a517743db3efb1c27928c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/packer/templates/devstack-pre-pip-pike.json b/packer/templates/devstack-pre-pip-pike.json
index 97ae02430..eed09e63a 100644
--- a/packer/templates/devstack-pre-pip-pike.json
+++ b/packer/templates/devstack-pre-pip-pike.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index 864d7b6c7..576f7f137 100644
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index 625ad3784..4361140ec 100644
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index 3fc43e09b..a99caf9b9 100644
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json
index 25823cd58..d9c88a39c 100644
--- a/packer/templates/kubernetes.json
+++ b/packer/templates/kubernetes.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": "roles/coe",
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -19,11 +15,6 @@
       "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "networks": [
diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index e96ade7d7..70a81d530 100644
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index 86ddf455a..bf203f453 100644
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,11 +10,6 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 3807026b1..68f0e5212 100644
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -19,11 +15,6 @@
       "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "networks": [
diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index d0f61e78d..a6b56635f 100644
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -19,11 +15,6 @@
       "instance_name": "{{user `distro`}}-robot-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "networks": [
diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
deleted file mode 100644
index 7eccab25c..000000000
--- a/packer/vars/cloud-env.json.example
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "public_auth_url": "https://auth.vexxhost.net/v3/",
-  "public_tenant": "TENNANTID",
-  "public_user": "USERID",
-  "public_pass": "USERPASS",
-  "public_network": "b5fcd86e-efac-4997-b8bc-dbe0d35bc229",
-  "ssh_proxy_host": ""
-}