Browse Source

Add separate rabbit admin entry for shipyard

Needed-By: https://review.openstack.org/614610
Change-Id: If8af8041382706e08d51077775abbd253df87722
changes/17/617817/5
Vladyslav Drok 7 months ago
parent
commit
86fd1df4d1

+ 14
- 2
deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -137,9 +137,15 @@ metadata:
137 137
     - src:
138 138
         schema: pegleg/AccountCatalogue/v1
139 139
         name: ucp_service_accounts
140
-        path: .ucp.airflow.oslo_messaging
140
+        path: .ucp.airflow.oslo_messaging.user
141 141
       dest:
142 142
         path: .values.endpoints.oslo_messaging.auth.user
143
+    - src:
144
+        schema: pegleg/AccountCatalogue/v1
145
+        name: ucp_service_accounts
146
+        path: .ucp.airflow.oslo_messaging.admin
147
+      dest:
148
+        path: .values.endpoints.oslo_messaging.auth.admin
143 149
 
144 150
     # Secrets
145 151
     - dest:
@@ -192,10 +198,16 @@ metadata:
192 198
         path: .
193 199
     - src:
194 200
         schema: deckhand/Passphrase/v1
195
-        name: ucp_oslo_messaging_password
201
+        name: ucp_airflow_oslo_messaging_password
196 202
         path: .
197 203
       dest:
198 204
         path: .values.endpoints.oslo_messaging.auth.user.password
205
+    - src:
206
+        schema: deckhand/Passphrase/v1
207
+        name: ucp_oslo_messaging_password
208
+        path: .
209
+      dest:
210
+        path: .values.endpoints.oslo_messaging.auth.admin.password
199 211
 
200 212
 data:
201 213
   chart_name: shipyard

+ 4
- 1
deployment_files/global/v1.0demo/software/config/service_accounts.yaml View File

@@ -68,7 +68,10 @@ data:
68 68
                 username: airflow
69 69
                 database: airflow
70 70
             oslo_messaging:
71
-                username: rabbitmq
71
+                admin:
72
+                    username: rabbitmq
73
+                user:
74
+                    username: airflow
72 75
         maas:
73 76
             admin:
74 77
                 username: admin

+ 14
- 2
deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -137,9 +137,15 @@ metadata:
137 137
     - src:
138 138
         schema: pegleg/AccountCatalogue/v1
139 139
         name: ucp_service_accounts
140
-        path: .ucp.airflow.oslo_messaging
140
+        path: .ucp.airflow.oslo_messaging.user
141 141
       dest:
142 142
         path: .values.endpoints.oslo_messaging.auth.user
143
+    - src:
144
+        schema: pegleg/AccountCatalogue/v1
145
+        name: ucp_service_accounts
146
+        path: .ucp.airflow.oslo_messaging.admin
147
+      dest:
148
+        path: .values.endpoints.oslo_messaging.auth.admin
143 149
 
144 150
     # Secrets
145 151
     - dest:
@@ -192,10 +198,16 @@ metadata:
192 198
         path: .
193 199
     - src:
194 200
         schema: deckhand/Passphrase/v1
195
-        name: ucp_oslo_messaging_password
201
+        name: ucp_airflow_oslo_messaging_password
196 202
         path: .
197 203
       dest:
198 204
         path: .values.endpoints.oslo_messaging.auth.user.password
205
+    - src:
206
+        schema: deckhand/Passphrase/v1
207
+        name: ucp_oslo_messaging_password
208
+        path: .
209
+      dest:
210
+        path: .values.endpoints.oslo_messaging.auth.admin.password
199 211
 
200 212
 data:
201 213
   chart_name: shipyard

+ 4
- 1
deployment_files/global/v1.0dev/software/config/service_accounts.yaml View File

@@ -68,7 +68,10 @@ data:
68 68
                 username: airflow
69 69
                 database: airflow
70 70
             oslo_messaging:
71
-                username: rabbitmq
71
+                admin:
72
+                    username: rabbitmq
73
+                user:
74
+                    username: airflow
72 75
         maas:
73 76
             admin:
74 77
                 username: admin

+ 11
- 0
deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml View File

@@ -0,0 +1,11 @@
1
+---
2
+schema: deckhand/Passphrase/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp_airflow_oslo_messaging_password
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data: password20
11
+...

+ 11
- 0
deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml View File

@@ -0,0 +1,11 @@
1
+---
2
+schema: deckhand/Passphrase/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp_airflow_oslo_messaging_password
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data: password20
11
+...

+ 11
- 0
deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml View File

@@ -0,0 +1,11 @@
1
+---
2
+schema: deckhand/Passphrase/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp_airflow_oslo_messaging_password
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data: password20
11
+...

+ 11
- 0
deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml View File

@@ -0,0 +1,11 @@
1
+---
2
+schema: deckhand/Passphrase/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp_airflow_oslo_messaging_password
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data: password20
11
+...

Loading…
Cancel
Save