Merge "Add separate rabbit admin entry for shipyard"

deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml

@@ -137,9 +137,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:
@@ -192,10 +198,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

deployment_files/global/v1.0demo/software/config/service_accounts.yaml

@@ -68,7 +68,10 @@ data:
                 username: airflow
                 database: airflow
             oslo_messaging:
-                username: rabbitmq
+                admin:
+                    username: rabbitmq
+                user:
+                    username: airflow
         maas:
             admin:
                 username: admin

deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml

@@ -137,9 +137,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:
@@ -192,10 +198,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

deployment_files/global/v1.0dev/software/config/service_accounts.yaml

@@ -68,7 +68,10 @@ data:
                 username: airflow
                 database: airflow
             oslo_messaging:
-                username: rabbitmq
+                admin:
+                    username: rabbitmq
+                user:
+                    username: airflow
         maas:
             admin:
                 username: admin

deployment_files/site/demo/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: password20
+...

deployment_files/site/dev-proxy/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: password20
+...

deployment_files/site/dev/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: password20
+...

deployment_files/site/gate-multinode/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: password20
+...