summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-26 14:42:28 +0000
committerGerrit Code Review <review@openstack.org>2018-12-26 14:42:28 +0000
commit97ccdc302f265ba543e3de013b4f6229c5e3f49b (patch)
tree62c150213968665c5d5386991a7c54904774086f
parent288ed8fa4cfcf6d6fd2492eda18c59953d8eb03b (diff)
parent86fd1df4d17d1fe4d6c0ecf1e33404422c0ddbfd (diff)
Merge "Add separate rabbit admin entry for shipyard"
-rw-r--r--deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml16
-rw-r--r--deployment_files/global/v1.0demo/software/config/service_accounts.yaml5
-rw-r--r--deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml16
-rw-r--r--deployment_files/global/v1.0dev/software/config/service_accounts.yaml5
-rw-r--r--deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml11
-rw-r--r--deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml11
-rw-r--r--deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml11
-rw-r--r--deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml11
8 files changed, 80 insertions, 6 deletions
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 8d6a2c6..5254acd 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:
137 - src: 137 - src:
138 schema: pegleg/AccountCatalogue/v1 138 schema: pegleg/AccountCatalogue/v1
139 name: ucp_service_accounts 139 name: ucp_service_accounts
140 path: .ucp.airflow.oslo_messaging 140 path: .ucp.airflow.oslo_messaging.user
141 dest: 141 dest:
142 path: .values.endpoints.oslo_messaging.auth.user 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 # Secrets 150 # Secrets
145 - dest: 151 - dest:
@@ -192,10 +198,16 @@ metadata:
192 path: . 198 path: .
193 - src: 199 - src:
194 schema: deckhand/Passphrase/v1 200 schema: deckhand/Passphrase/v1
195 name: ucp_oslo_messaging_password 201 name: ucp_airflow_oslo_messaging_password
196 path: . 202 path: .
197 dest: 203 dest:
198 path: .values.endpoints.oslo_messaging.auth.user.password 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
200data: 212data:
201 chart_name: shipyard 213 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 87a8c75..46eb4e2 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:
68 username: airflow 68 username: airflow
69 database: airflow 69 database: airflow
70 oslo_messaging: 70 oslo_messaging:
71 username: rabbitmq 71 admin:
72 username: rabbitmq
73 user:
74 username: airflow
72 maas: 75 maas:
73 admin: 76 admin:
74 username: admin 77 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 8d6a2c6..5254acd 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:
137 - src: 137 - src:
138 schema: pegleg/AccountCatalogue/v1 138 schema: pegleg/AccountCatalogue/v1
139 name: ucp_service_accounts 139 name: ucp_service_accounts
140 path: .ucp.airflow.oslo_messaging 140 path: .ucp.airflow.oslo_messaging.user
141 dest: 141 dest:
142 path: .values.endpoints.oslo_messaging.auth.user 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 # Secrets 150 # Secrets
145 - dest: 151 - dest:
@@ -192,10 +198,16 @@ metadata:
192 path: . 198 path: .
193 - src: 199 - src:
194 schema: deckhand/Passphrase/v1 200 schema: deckhand/Passphrase/v1
195 name: ucp_oslo_messaging_password 201 name: ucp_airflow_oslo_messaging_password
196 path: . 202 path: .
197 dest: 203 dest:
198 path: .values.endpoints.oslo_messaging.auth.user.password 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
200data: 212data:
201 chart_name: shipyard 213 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 87a8c75..46eb4e2 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:
68 username: airflow 68 username: airflow
69 database: airflow 69 database: airflow
70 oslo_messaging: 70 oslo_messaging:
71 username: rabbitmq 71 admin:
72 username: rabbitmq
73 user:
74 username: airflow
72 maas: 75 maas:
73 admin: 76 admin:
74 username: admin 77 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 0000000..66791a4
--- /dev/null
+++ b/deployment_files/site/demo/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
1---
2schema: deckhand/Passphrase/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp_airflow_oslo_messaging_password
6 layeringDefinition:
7 abstract: false
8 layer: site
9 storagePolicy: cleartext
10data: password20
11...
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 0000000..66791a4
--- /dev/null
+++ b/deployment_files/site/dev-proxy/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
1---
2schema: deckhand/Passphrase/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp_airflow_oslo_messaging_password
6 layeringDefinition:
7 abstract: false
8 layer: site
9 storagePolicy: cleartext
10data: password20
11...
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 0000000..66791a4
--- /dev/null
+++ b/deployment_files/site/dev/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
1---
2schema: deckhand/Passphrase/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp_airflow_oslo_messaging_password
6 layeringDefinition:
7 abstract: false
8 layer: site
9 storagePolicy: cleartext
10data: password20
11...
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 0000000..66791a4
--- /dev/null
+++ b/deployment_files/site/gate-multinode/secrets/passphrases/ucp_airflow_oslo_messaging_password.yaml
@@ -0,0 +1,11 @@
1---
2schema: deckhand/Passphrase/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp_airflow_oslo_messaging_password
6 layeringDefinition:
7 abstract: false
8 layer: site
9 storagePolicy: cleartext
10data: password20
11...