prefix vars with metrics role (#4)

3 files changed, 15 insertions, 15 deletions

diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
index bb8866263..525f32859 100644
--- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
@@ -20,7 +20,7 @@ spec:
     spec:
       serviceAccount: cassandra
       containers:
-      - image: "{{ image_prefix }}metrics-cassandra:{{ image_version }}"
+      - image: "{{ openshift_metrics_image_prefix }}metrics-cassandra:{{ openshift_metrics_image_version }}"
         name: hawkular-cassandra-{{ node }}
         ports:
         - name: cql-port
@@ -83,11 +83,11 @@ spec:
         terminationGracePeriodSeconds: 1800
       volumes:
       - name: cassandra-data
-{% if hawkular_cassandra_storage_type == 'emptydir' %}
+{% if openshift_metrics_hawkular_cassandra_storage_type == 'emptydir' %}
         emptyDir: {}
 {% else %}
         persistentVolumeClaim:
-          claimName: "{{ hawkular_cassandra_pv_prefix }}-{{ node }}"
+          claimName: "{{ openshift_metrics_hawkular_cassandra_pv_prefix }}-{{ node }}"
 {% endif %}
       - name: hawkular-cassandra-secrets
         secret:
diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
index bcfe9dc84..6f1275809 100644
--- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccount: hawkular
       containers:
-      - image: {{image_prefix}}metrics-hawkular-metrics:{{image_version}}
+      - image: {{openshift_metrics_image_prefix}}metrics-hawkular-metrics:{{openshift_metrics_image_version}}
         name: hawkular-metrics
         ports:
         - name: http-endpoint
@@ -36,7 +36,7 @@ spec:
         - "-Dhawkular.metrics.openshift.auth-methods=openshift-oauth,htpasswd"
         - "-Dhawkular.metrics.openshift.htpasswd-file=/secrets/hawkular-metrics.htpasswd.file"
         - "-Dhawkular.metrics.allowed-cors-access-control-allow-headers=authorization"
-        - "-Dhawkular.metrics.default-ttl={{metrics_duration}}"
+        - "-Dhawkular.metrics.default-ttl={{openshift_metrics_duration}}"
         - "-Dhawkular-alerts.cassandra-nodes=hawkular-cassandra"
         - "-Dhawkular-alerts.cassandra-use-ssl"
         - "-Dhawkular.alerts.openshift.auth-methods=openshift-oauth,htpasswd"
@@ -44,8 +44,8 @@ spec:
         - "-Dhawkular.alerts.allowed-cors-access-control-allow-headers=authorization"
         - "-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
         - "-Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
-        - "-DKUBERNETES_MASTER_URL={{master_url}}"
-        - "-DUSER_WRITE_ACCESS={{hawkular_user_write_access}}"
+        - "-DKUBERNETES_MASTER_URL={{openshift_metrics_master_url}}"
+        - "-DUSER_WRITE_ACCESS={{openshift_metrics_hawkular_user_write_access}}"
         - "--hmw.keystore=/secrets/hawkular-metrics.keystore"
         - "--hmw.truststore=/secrets/hawkular-metrics.truststore"
         - "--hmw.keystore_password_file=/secrets/hawkular-metrics.keystore.password"
@@ -59,7 +59,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: MASTER_URL
-          value: "{{ master_url }}"
+          value: "{{ openshift_metrics_master_url }}"
         - name: OPENSHIFT_KUBE_PING_NAMESPACE
           valueFrom:
             fieldRef:
diff --git a/roles/openshift_metrics/templates/heapster.j2 b/roles/openshift_metrics/templates/heapster.j2
index 779be0145..e4b4b9739 100644
--- a/roles/openshift_metrics/templates/heapster.j2
+++ b/roles/openshift_metrics/templates/heapster.j2
@@ -20,29 +20,29 @@ spec:
       serviceAccountName: heapster
       containers:
       - name: heapster
-        image: {{image_prefix}}metrics-heapster:{{image_version}}
+        image: {{openshift_metrics_image_prefix}}metrics-heapster:{{openshift_metrics_image_version}}
         ports:
         - containerPort: 8082
           name: "http-endpoint"
         command:
         - "heapster-wrapper.sh"
         - "--wrapper.allowed_users_file=/secrets/heapster.allowed-users"
-        - "--source=kubernetes:{{master_url}}?useServiceAccount=true&kubeletHttps=true&kubeletPort=10250"
+        - "--source=kubernetes:{{openshift_metrics_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"
         - "--allowed_users=%allowed_users%"
-        - "--metric_resolution={{metrics_resolution}}"
-{% if not heapster_standalone %}
+        - "--metric_resolution={{openshift_metrics_resolution}}"
+{% if not openshift_metrics_heapster_standalone %}
         - "--wrapper.username_file=/hawkular-account/hawkular-metrics.username"
         - "--wrapper.password_file=/hawkular-account/hawkular-metrics.password"
         - "--wrapper.endpoint_check=https://hawkular-metrics:443/hawkular/metrics/status"
-        - "--sink=hawkular:https://hawkular-metrics:443?tenant=_system&labelToTenant=pod_namespace&labelNodeId={{metrics_node_id}}&caCert=/hawkular-cert/hawkular-metrics-ca.certificate&user=%username%&pass=%password%&filter=label(container_name:^system.slice.*|^user.slice)"
+        - "--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 %}
         volumeMounts:
         - name: heapster-secrets
           mountPath: "/secrets"
-{% if not heapster_standalone %}
+{% if not openshift_metrics_heapster_standalone %}
         - name: hawkular-metrics-certificate
           mountPath: "/hawkular-cert"
         - name: hawkular-metrics-account
@@ -56,7 +56,7 @@ spec:
         - name: heapster-secrets
           secret:
             secretName: heapster-secrets
-{% if not heapster_standalone %}
+{% if not openshift_metrics_heapster_standalone %}
         - name: hawkular-metrics-certificate
           secret:
             secretName: hawkular-metrics-certificate