From 9ca4196d92b9962a0cceb56570511e3eac8064ee Mon Sep 17 00:00:00 2001
From: Ignatious Johnson Christopher <ijohnson@juniper.net>
Date: Wed, 8 Aug 2018 01:08:24 +0000
Subject: [PATCH] New key value pair group named kolla_passwords

is introduced to  hold openstack serivce passwords.

Change-Id: I48f067cbb89269323b2b95ba71dd6e3461e13f3c
Closes-Bug: 1785449
---
 pkg/cluster/configs/instances.tmpl   | 11 ++++++++++-
 schemas/fabric/openstack_cluster.yml |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkg/cluster/configs/instances.tmpl b/pkg/cluster/configs/instances.tmpl
index 5fc206f797..8d853b449b 100644
--- a/pkg/cluster/configs/instances.tmpl
+++ b/pkg/cluster/configs/instances.tmpl
@@ -64,7 +64,9 @@ contrail_configuration:
   KEYSTONE_AUTH_HOST: {%if openstackCluster.OpenstackInternalVip %}{{openstackCluster.OpenstackInternalVip}}{%else%}{% for node in nodes %}{%if openstackCluster.OpenstackControlNodes.0.NodeRefs.0.UUID == node.UUID %}{{node.IPAddress}}{%endif%}{%endfor%}{%endif%}
   KEYSTONE_AUTH_URL_VERSION: {%if cluster.KeystoneVersion %}/{{cluster.KeystoneVersion}}{%else%}/v3{%endif%}
   {% for key_value in cluster.ContrailConfiguration.KeyValuePair %}
+  {% if key_value.Key && key_value.Value%}
   {{key_value.Key}}: {{key_value.Value}}
+  {%endif%}
   {%endfor%}
 
 kolla_config:
@@ -75,8 +77,15 @@ kolla_config:
     {% if openstackCluster.OpenstackRegistry && openstackCluster.OpenstackRegistry != "default" %}docker_registry: {{ openstackCluster.OpenstackRegistry }}{%endif%}
     {%if openstackCluster.OpenstackExternalVip %}kolla_external_vip_address: {{openstackCluster.OpenstackExternalVip}}{%endif%}
     {% for key_value in openstackCluster.KollaGlobals.KeyValuePair %}
+    {% if key_value.Key && key_value.Value%}
     {{key_value.Key}}: {{key_value.Value}}
+    {%endif%}
     {%endfor%}
   kolla_passwords:
-    keystone_admin_password: {%if openstackCluster.KeystoneAdminPassword %}{{openstackCluster.KeystoneAdminPassword}}{%else%}contrail123{%endif%}
+    keystone_admin_password: contrail123
+    {% for key_value in openstackCluster.KollaPasswords.KeyValuePair %}
+    {% if key_value.Key && key_value.Value%}
+    {{key_value.Key}}: {{key_value.Value}}
+    {%endif%}
+    {%endfor%}
 {%endif%}
diff --git a/schemas/fabric/openstack_cluster.yml b/schemas/fabric/openstack_cluster.yml
index 3f0f0ac07f..8eed83366c 100755
--- a/schemas/fabric/openstack_cluster.yml
+++ b/schemas/fabric/openstack_cluster.yml
@@ -142,6 +142,11 @@ schema:
       presence: "optional"
       description: "Custom kolla global configurations. Specified as list of Key:Value pairs."
       $ref: "types.json#/definitions/KeyValuePairs"
+    kolla_passwords:
+      operations: "CRUD"
+      presence: "optional"
+      description: "Custom kolla password configurations. Specified as list of Key:Value pairs."
+      $ref: "types.json#/definitions/KeyValuePairs"
 singular: openstack_cluster
 title: Openstack Cluster
 type: ""