From aefba12f3518f691169cbe1dd326451679532f9e Mon Sep 17 00:00:00 2001
From: Vladyslav Drok <vdrok@mirantis.com>
Date: Tue, 13 Nov 2018 11:45:47 -0800
Subject: [PATCH] Add separate rabbit admin entry for shipyard

Needed-By: https://review.openstack.org/614610
Change-Id: I505a4d01233af2f9820ced77ec0cb4ed30f32f1f
---
 .../software/charts/ucp/shipyard/shipyard.yaml   | 16 ++++++++++++++--
 .../ucp_airflow_oslo_messaging_password.yaml     | 11 +++++++++++
 .../software/config/service_accounts.yaml        |  5 ++++-
 .../ucp_airflow_oslo_messaging_password.yaml     | 11 +++++++++++
 .../software/config/service_accounts.yaml        |  5 ++++-
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
 create mode 100644 site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml

diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml
index 0b0d0f9f1..263b99bee 100644
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@@ -164,9 +164,15 @@ metadata:
     - src:
         schema: pegleg/AccountCatalogue/v1
         name: ucp_service_accounts
-        path: .ucp.airflow.oslo_messaging
+        path: .ucp.airflow.oslo_messaging.user
       dest:
         path: .values.endpoints.oslo_messaging.auth.user
+    - src:
+        schema: pegleg/AccountCatalogue/v1
+        name: ucp_service_accounts
+        path: .ucp.airflow.oslo_messaging.admin
+      dest:
+        path: .values.endpoints.oslo_messaging.auth.admin
 
     # Secrets
     - dest:
@@ -219,10 +225,16 @@ metadata:
         path: .
     - src:
         schema: deckhand/Passphrase/v1
-        name: ucp_oslo_messaging_password
+        name: ucp_airflow_oslo_messaging_password
         path: .
       dest:
         path: .values.endpoints.oslo_messaging.auth.user.password
+    - src:
+        schema: deckhand/Passphrase/v1
+        name: ucp_oslo_messaging_password
+        path: .
+      dest:
+        path: .values.endpoints.oslo_messaging.auth.admin.password
 
 data:
   chart_name: shipyard
diff --git a/site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
new file mode 100644
index 000000000..33c4125ef
--- /dev/null
+++ b/site/airship-seaworthy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp_airflow_oslo_messaging_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...
diff --git a/site/airship-seaworthy/software/config/service_accounts.yaml b/site/airship-seaworthy/software/config/service_accounts.yaml
index 9e6ffe99e..accf55954 100644
--- a/site/airship-seaworthy/software/config/service_accounts.yaml
+++ b/site/airship-seaworthy/software/config/service_accounts.yaml
@@ -75,7 +75,10 @@ data:
                 username: airflow
                 database: airflow
             oslo_messaging:
-                username: rabbitmq
+                admin:
+                    username: rabbitmq
+                user:
+                    username: airflow
         maas:
             admin:
                 username: admin
diff --git a/site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
new file mode 100644
index 000000000..33c4125ef
--- /dev/null
+++ b/site/airskiff/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
+---
+schema: deckhand/Passphrase/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp_airflow_oslo_messaging_password
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data: password123
+...
diff --git a/site/airskiff/software/config/service_accounts.yaml b/site/airskiff/software/config/service_accounts.yaml
index 9e6ffe99e..accf55954 100644
--- a/site/airskiff/software/config/service_accounts.yaml
+++ b/site/airskiff/software/config/service_accounts.yaml
@@ -75,7 +75,10 @@ data:
                 username: airflow
                 database: airflow
             oslo_messaging:
-                username: rabbitmq
+                admin:
+                    username: rabbitmq
+                user:
+                    username: airflow
         maas:
             admin:
                 username: admin