diff options
| author | Juraci Paixão Kröhling <juraci@kroehling.de> | 2017-02-14 17:38:22 +0100 |
|---|---|---|
| committer | Juraci Paixão Kröhling <juraci@kroehling.de> | 2017-02-24 16:48:17 +0100 |
| commit | c6d48d91722384b92dcaf4749de2b0621b7102a1 (patch) | |
| tree | 52d9d77fd164a46ed9fab13c094a6e21ffd78824 /roles/openshift_metrics/templates | |
| parent | cecc1f83edf078842e7ca104f9dc495bf65b1e9b (diff) | |
| download | openshift-c6d48d91722384b92dcaf4749de2b0621b7102a1.tar.gz openshift-c6d48d91722384b92dcaf4749de2b0621b7102a1.tar.bz2 openshift-c6d48d91722384b92dcaf4749de2b0621b7102a1.tar.xz openshift-c6d48d91722384b92dcaf4749de2b0621b7102a1.zip | |
Removed JGroups cert and password generation.
Diffstat (limited to 'roles/openshift_metrics/templates')
| -rw-r--r-- | roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 index d39f1b43a..361378df3 100644 --- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 @@ -58,9 +58,6 @@ spec: - "--hmw.truststore=/secrets/hawkular-metrics.truststore" - "--hmw.keystore_password_file=/secrets/hawkular-metrics.keystore.password" - "--hmw.truststore_password_file=/secrets/hawkular-metrics.truststore.password" - - "--hmw.jgroups_keystore=/secrets/hawkular-metrics.jgroups.keystore" - - "--hmw.jgroups_keystore_password_file=/secrets/hawkular-metrics.jgroups.keystore.password" - - "--hmw.jgroups_alias_file=/secrets/hawkular-metrics.jgroups.alias" env: - name: POD_NAMESPACE valueFrom: @@ -68,6 +65,8 @@ spec: fieldPath: metadata.namespace - name: MASTER_URL value: "{{ openshift_metrics_master_url }}" + - name: JGROUPS_PASSWORD + value: "{{ 17 | oo_random_word }}" - name: OPENSHIFT_KUBE_PING_NAMESPACE valueFrom: fieldRef: @@ -81,10 +80,10 @@ spec: mountPath: "/secrets" - name: hawkular-metrics-client-secrets mountPath: "/client-secrets" -{% if ((openshift_metrics_hawkular_limits_cpu is defined and openshift_metrics_hawkular_limits_cpu is not none) +{% if ((openshift_metrics_hawkular_limits_cpu is defined and openshift_metrics_hawkular_limits_cpu is not none) or (openshift_metrics_hawkular_limits_memory is defined and openshift_metrics_hawkular_limits_memory is not none) or (openshift_metrics_hawkular_requests_cpu is defined and openshift_metrics_hawkular_requests_cpu is not none) - or (openshift_metrics_hawkular_requests_memory is defined and openshift_metrics_hawkular_requests_memory is not none)) + or (openshift_metrics_hawkular_requests_memory is defined and openshift_metrics_hawkular_requests_memory is not none)) %} resources: {% if (openshift_metrics_hawkular_limits_cpu is not none @@ -98,8 +97,8 @@ spec: memory: "{{openshift_metrics_hawkular_limits_memory}}" {% endif %} {% endif %} -{% if (openshift_metrics_hawkular_requests_cpu is not none - or openshift_metrics_hawkular_requests_memory is not none) +{% if (openshift_metrics_hawkular_requests_cpu is not none + or openshift_metrics_hawkular_requests_memory is not none) %} requests: {% if openshift_metrics_hawkular_requests_cpu is not none %} |