From 86fd1df4d17d1fe4d6c0ecf1e33404422c0ddbfd Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Tue, 13 Nov 2018 11:56:55 -0800 Subject: [PATCH] Add separate rabbit admin entry for shipyard Needed-By: https://review.openstack.org/614610 Change-Id: If8af8041382706e08d51077775abbd253df87722 --- .../software/charts/ucp/shipyard/shipyard.yaml | 16 ++++++++++++++-- .../software/config/service_accounts.yaml | 5 ++++- .../software/charts/ucp/shipyard/shipyard.yaml | 16 ++++++++++++++-- .../software/config/service_accounts.yaml | 5 ++++- .../ucp_airflow_oslo_messaging_password.yaml | 11 +++++++++++ .../ucp_airflow_oslo_messaging_password.yaml | 11 +++++++++++ .../ucp_airflow_oslo_messaging_password.yaml | 11 +++++++++++ .../ucp_airflow_oslo_messaging_password.yaml | 11 +++++++++++ 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml create mode 100644 deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml create mode 100644 deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml create mode 100644 deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml index 8d6a2c60..5254acd9 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml +++ b/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 diff --git a/deployment_files/global/v1.0demo/software/config/service_accounts.yaml b/deployment_files/global/v1.0demo/software/config/service_accounts.yaml index 87a8c75f..46eb4e2d 100644 --- a/deployment_files/global/v1.0demo/software/config/service_accounts.yaml +++ b/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 diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml index 8d6a2c60..5254acd9 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml +++ b/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 diff --git a/deployment_files/global/v1.0dev/software/config/service_accounts.yaml b/deployment_files/global/v1.0dev/software/config/service_accounts.yaml index 87a8c75f..46eb4e2d 100644 --- a/deployment_files/global/v1.0dev/software/config/service_accounts.yaml +++ b/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 diff --git a/deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml new file mode 100644 index 00000000..66791a4d --- /dev/null +++ b/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 +... diff --git a/deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml new file mode 100644 index 00000000..66791a4d --- /dev/null +++ b/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 +... diff --git a/deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml new file mode 100644 index 00000000..66791a4d --- /dev/null +++ b/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 +... diff --git a/deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml b/deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml new file mode 100644 index 00000000..66791a4d --- /dev/null +++ b/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 +...