openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fix to configure RABBIT_CAPABILITIES"

Browse Source
This commit is contained in:
Zuul 2018-07-31 00:10:48 +00:00 committed by Gerrit Code Review
commit 91b83aeabb
2 changed files with 2 additions and 1 deletions
rabbitmq
templates/monitoring/prometheus
exporter-deployment.yaml
values.yaml

2
rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml

@ -59,7 +59,7 @@ spec:
- name: RABBIT_PASSWORD - name: RABBIT_PASSWORD
value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote }} value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote }}
- name: RABBIT_CAPABILITIES - name: RABBIT_CAPABILITIES
value: {{ tuple $envAll.Values.conf.prometheus_exporter.capabilities $envAll | include "helm-toolkit.utils.joinListWithComma" | quote }} value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
- name: PUBLISH_PORT - name: PUBLISH_PORT
value: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port | quote }} value: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port | quote }}
- name: LOG_LEVEL - name: LOG_LEVEL

1
rabbitmq/values.yaml

@ -106,6 +106,7 @@ conf:
prometheus_exporter: prometheus_exporter:
capabilities: capabilities:
- no_sort - no_sort
- bert
log_level: info log_level: info
skipverify: 1 skipverify: 1
rabbitmq: rabbitmq: