From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 11 Sep 2018 22:34:48 +0000 (-0400)
Subject: Remove OpenStack config found in clouds.yaml
X-Git-Tag: v0.1.0~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=dc6540e49114447f51749c699a0b67a65eb9ee9e;p=releng%2Fcommon-packer.git

Remove OpenStack config found in clouds.yaml

We can now reuse configuration already existing in our clouds.yaml to
run packer builds against instead of duplicating that effort in var
files. Packer added this feature in version 1.2.5.

Packer does not read profiles so we have to explicitly pass
some variables that would normally be pulled from profiles such
as auth_url, user_domain_name, and project_domain_name.

  linuxfoundation:
    profile: vexxhost
    auth:
      auth_url: 'https://auth.vexxhost.net/v3/'
      project_name: abc
      username: 123
      password: v1.2.3
      user_domain_name: Default
      project_domain_name: Default
    region_name: ca-ymq-1

Issue: RELENG-1205
Change-Id: I9f05ec1c430a9261e45dc801e5e5aab52a22cfba
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/docs/requirements.rst b/docs/requirements.rst
index 4efabda..97bef38 100644
--- a/docs/requirements.rst
+++ b/docs/requirements.rst
@@ -3,7 +3,7 @@ Requirements
 ############
 
 * Ansible 2.4.1 or later
-* Packer 1.2.3 or later
+* Packer 1.2.5 or later
 
 Install Ansible via pip in a virtualenv if the version is not available via
 your local package manager.
diff --git a/templates/builder.json b/templates/builder.json
index f9cc918..9154d6b 100644
--- a/templates/builder.json
+++ b/templates/builder.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "arch": "x86_64",
     "base_image": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "distro": null,
     "flavor": "v1-standard-1",
@@ -21,11 +17,6 @@
       "instance_name": "{{user `distro`}}-builder-{{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/templates/docker.json b/templates/docker.json
index ced77bc..c595162 100644
--- a/templates/docker.json
+++ b/templates/docker.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "arch": "x86_64",
     "base_image": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "distro": null,
     "flavor": "v1-standard-1",
@@ -21,11 +17,6 @@
       "instance_name": "{{user `distro`}}-docker-{{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/templates/windows-builder.json b/templates/windows-builder.json
index 230e458..49eab6e 100644
--- a/templates/windows-builder.json
+++ b/templates/windows-builder.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "arch": "x86_64",
     "base_image": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "distro": null,
     "flavor": "v1-standard-4"
@@ -19,11 +15,6 @@
       "instance_name": "{{user `distro`}}-win-builder-{{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/vars/cloud-env.json.example b/vars/cloud-env.json.example
index ac6f8ad..e5adc02 100644
--- a/vars/cloud-env.json.example
+++ b/vars/cloud-env.json.example
@@ -1,8 +1,4 @@
 {
-  "cloud_auth_url": "https://auth.vexxhost.net/v3/",
-  "cloud_tenant": "TENNANTID",
-  "cloud_user": "USERID",
-  "cloud_pass": "USERPASS",
   "cloud_network": "NETWORK",
   "ssh_proxy_host": ""
 }