diff options
| author | John Sanda <jsanda@redhat.com> | 2017-08-14 15:35:46 -0400 |
|---|---|---|
| committer | John Sanda <jsanda@redhat.com> | 2017-08-14 15:35:46 -0400 |
| commit | b9314a085d5cb498a50ffeaf5d8a756c37a67eb7 (patch) | |
| tree | 4e6086e47424f9b601ad60ef8cd961042805bf25 | |
| parent | 09722458d9551f3ce2ad6d3a2c5e58dbce1f0719 (diff) | |
| download | openshift-b9314a085d5cb498a50ffeaf5d8a756c37a67eb7.tar.gz openshift-b9314a085d5cb498a50ffeaf5d8a756c37a67eb7.tar.bz2 openshift-b9314a085d5cb498a50ffeaf5d8a756c37a67eb7.tar.xz openshift-b9314a085d5cb498a50ffeaf5d8a756c37a67eb7.zip | |
rename vars to avoid double negatives and ensuing confusion
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 | 4 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index f738dada9..1336e182f 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -60,5 +60,5 @@ openshift_metrics_hawkular_user_write_access: False openshift_metrics_heapster_allowed_users: system:master-proxy -openshift_metrics_cassandra_disable_prometheus_endpoint: False -openshift_metrics_hawkular_disable_prometheus_endpoint: False +openshift_metrics_cassandra_enable_prometheus_endpoint: True +openshift_metrics_hawkular_enable_prometheus_endpoint: True diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 index d4d574aca..6f341bcfb 100644 --- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 @@ -56,8 +56,8 @@ spec: value: "/cassandra_data" - name: JVM_OPTS value: "-Dcassandra.commitlog.ignorereplayerrors=true" - - name: DISABLE_PROMETHEUS_ENDPOINT - value: "{{ openshift_metrics_cassandra_disable_prometheus_endpoint }}" + - name: ENABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_cassandra_enable_prometheus_endpoint }}" - name: TRUSTSTORE_NODES_AUTHORITIES value: "/hawkular-cassandra-certs/tls.peer.truststore.crt" - name: TRUSTSTORE_CLIENT_AUTHORITIES diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 index a3c51c5d6..59f7fb44a 100644 --- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 @@ -67,8 +67,8 @@ spec: value: "{{ 17 | oo_random_word }}" - name: TRUSTSTORE_AUTHORITIES value: "/hawkular-metrics-certs/tls.truststore.crt" - - name: DISABLE_PROMETHEUS_ENDPOINT - value: "{{ openshift_metrics_hawkular_disable_prometheus_endpoint }}" + - name: ENABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_hawkular_enable_prometheus_endpoint }}" - name: OPENSHIFT_KUBE_PING_NAMESPACE valueFrom: fieldRef: |