From b6ce0464142403785a7ba8eae664286082f4d30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Barcarol=20Guimar=C3=A3es?= <bbarcaro@redhat.com>
Date: Mon, 5 Dec 2016 16:34:32 +0000
Subject: Custom certificates (#5)

* Generate secrets on a persistent directory.

* Split certificate generation files.

* Custom certificates.

* Minor fixes.

- use `slurp` instead of `shell: base64`
- fix route hostname

* Updates on origin-metrics.
---
 roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 | 2 ++
 roles/openshift_metrics/templates/hawkular_metrics_rc.j2   | 2 ++
 roles/openshift_metrics/templates/heapster.j2              | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'roles/openshift_metrics/templates')

diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
index 525f32859..158d0d1a3 100644
--- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
@@ -49,6 +49,8 @@ spec:
           value: "{{ master }}"
         - name: CASSANDRA_DATA_VOLUME
           value: "/cassandra_data"
+        - name: JVM_OPTS
+          value: "-Dcassandra.commitlog.ignorereplayerrors=true"
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
index 6f1275809..647a4bfbb 100644
--- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
@@ -66,6 +66,8 @@ spec:
               fieldPath: metadata.namespace
         - name: OPENSHIFT_KUBE_PING_LABELS
           value: "metrics-infra=hawkular-metrics,name=hawkular-metrics"
+        - name: STARTUP_TIMEOUT
+          value: "{{ openshift_metrics_startup_timeout }}"
         volumeMounts:
         - name: hawkular-metrics-secrets
           mountPath: "/secrets"
diff --git a/roles/openshift_metrics/templates/heapster.j2 b/roles/openshift_metrics/templates/heapster.j2
index e4b4b9739..90227db68 100644
--- a/roles/openshift_metrics/templates/heapster.j2
+++ b/roles/openshift_metrics/templates/heapster.j2
@@ -27,7 +27,7 @@ spec:
         command:
         - "heapster-wrapper.sh"
         - "--wrapper.allowed_users_file=/secrets/heapster.allowed-users"
-        - "--source=kubernetes:{{openshift_metrics_master_url}}?useServiceAccount=true&kubeletHttps=true&kubeletPort=10250"
+        - "--source=kubernetes.summary_api:${MASTER_URL}?useServiceAccount=true&kubeletHttps=true&kubeletPort=10250"
         - "--tls_cert=/secrets/heapster.cert"
         - "--tls_key=/secrets/heapster.key"
         - "--tls_client_ca=/secrets/heapster.client-ca"
@@ -39,6 +39,9 @@ spec:
         - "--wrapper.endpoint_check=https://hawkular-metrics:443/hawkular/metrics/status"
         - "--sink=hawkular:https://hawkular-metrics:443?tenant=_system&labelToTenant=pod_namespace&labelNodeId={{openshift_metrics_node_id}}&caCert=/hawkular-cert/hawkular-metrics-ca.certificate&user=%username%&pass=%password%&filter=label(container_name:^system.slice.*|^user.slice)"
 {% endif %}
+        env:
+        - name: STARTUP_TIMEOUT
+          value: "{{ openshift_metrics_startup_timeout }}"
         volumeMounts:
         - name: heapster-secrets
           mountPath: "/secrets"
-- 
cgit v1.2.1