Merge "Fix prometheus and grafana password overrides"

This commit is contained in:
Zuul 2019-01-17 17:45:10 +00:00 committed by Gerrit Code Review
commit 31dfbac91d
2 changed files with 9 additions and 9 deletions

View File

@ -68,12 +68,6 @@ metadata:
path: .osh_infra.grafana.oslo_db
dest:
path: .values.endpoints.oslo_db.auth.user
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
path: .osh_infra.prometheus.admin
dest:
path: .values.endpoints.monitoring.auth.admin
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
@ -94,6 +88,12 @@ metadata:
dest:
path: .values.endpoints.oslo_db_session.path
pattern: DB_NAME
- src:
schema: pegleg/AccountCatalogue/v1
name: osh_infra_service_accounts
path: .osh_infra.prometheus.admin
dest:
path: .values.endpoints.monitoring.auth.user
# Secrets
- dest:
@ -127,7 +127,7 @@ metadata:
name: osh_infra_oslo_db_admin_password
path: .
- dest:
path: .values.endpoints.monitoring.auth.admin.password
path: .values.endpoints.monitoring.auth.user.password
src:
schema: deckhand/Passphrase/v1
name: osh_infra_prometheus_admin_password

View File

@ -50,11 +50,11 @@ metadata:
name: osh_infra_service_accounts
path: .osh_infra.prometheus.admin
dest:
path: .values.endpoints.prometheus.auth.admin
path: .values.endpoints.monitoring.auth.admin
# Secrets
- dest:
path: .values.endpoints.prometheus.auth.admin.password
path: .values.endpoints.monitoring.auth.admin.password
src:
schema: deckhand/Passphrase/v1
name: osh_infra_prometheus_admin_password