Merge "Add Prometheus auth to armada multinode deployment"

This commit is contained in:
Zuul 2018-08-15 00:10:58 +00:00 committed by Gerrit Code Review
commit 65026c6a12
2 changed files with 10 additions and 0 deletions
tools/deployment/armada

@ -55,6 +55,7 @@ passwords="BARBICAN_DB_PASSWORD \
NOVA_RABBITMQ_USER_PASSWORD \
NOVA_USER_PASSWORD \
OPENSTACK_EXPORTER_USER_PASSWORD \
PROMETHEUS_ADMIN_PASSWORD \
SWIFT_USER_PASSWORD"
for password in $passwords

@ -393,6 +393,11 @@ data:
pod:
replicas:
prometheus: 2
endpoints:
monitoring:
auth:
admin:
password: ${PROMETHEUS_ADMIN_PASSWORD}
source:
type: local
location: ${OSH_INFRA_PATH}
@ -596,6 +601,10 @@ data:
auth:
admin:
password: ${GRAFANA_ADMIN_PASSWORD}
monitoring:
auth:
admin:
password: ${PROMETHEUS_ADMIN_PASSWORD}
labels:
grafana:
node_selector_key: openstack-control-plane