openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Mariadb: Use correct credentials for exporter in secret"

Browse Source
This commit is contained in:
Zuul 2019-02-04 16:53:51 +00:00 committed by Gerrit Code Review
commit 340f4bdbe1
3 changed files with 4 additions and 2 deletions
mariadb/templates/monitoring/prometheus/secrets
_exporter_user.cnf.tpl
tools/deployment
multinode
045-mariadb.sh
osh-infra-monitoring
045-mariadb.sh

4
mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl

@ -15,7 +15,7 @@ limitations under the License.
*/}}
[client]
user = {{ .Values.endpoints.prometheus_mysql_exporter.auth.user.username }}
password = {{ .Values.endpoints.prometheus_mysql_exporter.auth.user.password }}
user = {{ .Values.endpoints.oslo_db.auth.exporter.username }}
password = {{ .Values.endpoints.oslo_db.auth.exporter.password }}
host = {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
port = {{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}

1
tools/deployment/multinode/045-mariadb.sh

@ -23,6 +23,7 @@ make mariadb
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
helm upgrade --install mariadb ./mariadb \
--namespace=osh-infra \
--set monitoring.prometheus.enabled=true \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB}

1
tools/deployment/osh-infra-monitoring/045-mariadb.sh

@ -24,6 +24,7 @@ make mariadb
helm upgrade --install mariadb ./mariadb \
--namespace=osh-infra \
--set pod.replicas.server=1 \
--set monitoring.prometheus.enabled=true \
${OSH_INFRA_EXTRA_HELM_ARGS} \
${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB}