From 735271af71365e1f8186b28e79c1ded360004784 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 8 May 2019 08:30:35 -0500
Subject: [PATCH] Add missing passwords to armada-osh manifest

This adds missing passwords to the armada-osh manifest. These
passwords include: passwords for the test users used for the
openstack chart helm tests, the password for the mariadb sst user
deployed in the openstack namespace, and the mariadb exporter
user for the openstack mariadb instance

Change-Id: Ia04ab3d83d1967c4ab65915adaec53d488f451fb
---
 .../deployment/armada/generate-osh-passwords.sh  |  8 ++++++++
 .../deployment/armada/manifests/armada-osh.yaml  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/tools/deployment/armada/generate-osh-passwords.sh b/tools/deployment/armada/generate-osh-passwords.sh
index a09ea82a8a..8c2ae8c514 100755
--- a/tools/deployment/armada/generate-osh-passwords.sh
+++ b/tools/deployment/armada/generate-osh-passwords.sh
@@ -21,29 +21,37 @@ passwords="BARBICAN_DB_PASSWORD \
     BARBICAN_USER_PASSWORD \
     CINDER_DB_PASSWORD \
     CINDER_RABBITMQ_USER_PASSWORD \
+    CINDER_TEST_USER_PASSWORD \
     CINDER_USER_PASSWORD \
     GLANCE_DB_PASSWORD \
     GLANCE_RABBITMQ_USER_PASSWORD \
+    GLANCE_TEST_USER_PASSWORD \
     GLANCE_USER_PASSWORD \
     HEAT_DB_PASSWORD \
     HEAT_RABBITMQ_USER_PASSWORD \
     HEAT_STACK_PASSWORD \
+    HEAT_TEST_USER_PASSWORD \
     HEAT_TRUSTEE_PASSWORD \
     HEAT_USER_PASSWORD \
     KEYSTONE_ADMIN_PASSWORD \
     KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \
     KEYSTONE_DB_PASSWORD \
     KEYSTONE_RABBITMQ_USER_PASSWORD \
+    KEYSTONE_TEST_USER_PASSWORD \
     METADATA_PROXY_SHARED_SECRET \
     NEUTRON_DB_PASSWORD \
     NEUTRON_RABBITMQ_USER_PASSWORD \
+    NEUTRON_TEST_USER_PASSWORD \
     NEUTRON_USER_PASSWORD \
     NOVA_DB_PASSWORD \
     NOVA_PLACEMENT_USER_PASSWORD \
     NOVA_RABBITMQ_USER_PASSWORD \
+    NOVA_TEST_USER_PASSWORD \
     NOVA_USER_PASSWORD \
     OPENSTACK_EXPORTER_USER_PASSWORD \
     OSH_MARIADB_ADMIN_PASSWORD \
+    OSH_MARIADB_EXPORTER_PASSWORD \
+    OSH_MARIADB_SST_PASSWORD \
     RABBITMQ_ADMIN_PASSWORD \
     SWIFT_USER_PASSWORD"
 
diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index c0671cfd33..4d1ac11769 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -137,6 +137,10 @@ data:
         auth:
           admin:
             password: ${OSH_MARIADB_ADMIN_PASSWORD}
+          exporter:
+            password: ${OSH_MARIADB_EXPORTER_PASSWORD}
+          sst:
+            password: ${OSH_MARIADB_SST_PASSWORD}
     monitoring:
       prometheus:
         enabled: True
@@ -356,6 +360,8 @@ data:
         auth:
           admin:
             password: ${KEYSTONE_ADMIN_PASSWORD}
+          test:
+            password: ${KEYSTONE_TEST_USER_PASSWORD}
       oslo_cache:
         auth:
           memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY}
@@ -562,6 +568,8 @@ data:
             password: ${KEYSTONE_ADMIN_PASSWORD}
           glance:
             password: ${GLANCE_USER_PASSWORD}
+          test:
+            password: ${GLANCE_TEST_USER_PASSWORD}
       oslo_db:
         auth:
           admin:
@@ -645,6 +653,8 @@ data:
             password: ${KEYSTONE_ADMIN_PASSWORD}
           cinder:
             password: ${CINDER_USER_PASSWORD}
+          test:
+            password: ${CINDER_TEST_USER_PASSWORD}
       oslo_db:
         auth:
           admin:
@@ -897,6 +907,8 @@ data:
             password: ${NEUTRON_USER_PASSWORD}
           placement:
             password: ${NOVA_PLACEMENT_USER_PASSWORD}
+          test:
+            password: ${NOVA_TEST_USER_PASSWORD}
       oslo_db:
         auth:
           admin:
@@ -1105,6 +1117,8 @@ data:
             password: ${NEUTRON_USER_PASSWORD}
           nova:
             password: ${NOVA_USER_PASSWORD}
+          test:
+            password: ${NEUTRON_TEST_USER_PASSWORD}
       oslo_db:
         auth:
           admin:
@@ -1355,6 +1369,8 @@ data:
             password: ${HEAT_TRUSTEE_PASSWORD}
           heat_stack_user:
             password: ${HEAT_STACK_PASSWORD}
+          test:
+            password: ${HEAT_TEST_USER_PASSWORD}
       oslo_db:
         auth:
           admin: