Merge "Add separate rabbit admin entry for shipyard"

This commit is contained in:
Zuul 2018-12-26 14:42:28 +00:00 committed by Gerrit Code Review
commit 97ccdc302f
8 changed files with 80 additions and 6 deletions

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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
...

View File

@ -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
...

View File

@ -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
...

View File

@ -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
...