prefix vars with metrics role (#4)

5 files changed, 22 insertions, 22 deletions

diff --git a/roles/openshift_metrics/tasks/cleanup.yaml b/roles/openshift_metrics/tasks/cleanup.yaml
index a61fed7b4..a29faef31 100644
--- a/roles/openshift_metrics/tasks/cleanup.yaml
+++ b/roles/openshift_metrics/tasks/cleanup.yaml
@@ -1,14 +1,14 @@
 ---
 - name: remove metrics components
   command: >
-    {{ openshift.common.client_binary }} -n '{{ metrics_project }}'
+    {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}'
     delete --selector=metrics-infra
     all,sa,secrets,templates,routes,pvc,rolebindings,clusterrolebindings
   register: delete_metrics
   changed_when: "delete_metrics.stdout != 'No resources found'"
 - name: remove rolebindings
   command: >
-    {{ openshift.common.client_binary }} -n {{ metrics_project }}
+    {{ openshift.common.client_binary }} -n {{ openshift_metrics_project }}
     delete --ignore-not-found
     rolebinding/hawkular-view
     clusterrolebinding/heapster-cluster-reader
diff --git a/roles/openshift_metrics/tasks/generate_certificates.yaml b/roles/openshift_metrics/tasks/generate_certificates.yaml
index b1ecf46b9..9f6a3348e 100644
--- a/roles/openshift_metrics/tasks/generate_certificates.yaml
+++ b/roles/openshift_metrics/tasks/generate_certificates.yaml
@@ -25,14 +25,14 @@
 # TODO maybe there's an easier way to get the service accounts' ca crt?
 - name: get heapster service account secrets
   shell: >
-    {{ openshift.common.client_binary }} -n '{{ metrics_project }}'
+    {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}'
     get serviceaccount/default
     --template '{{ '{{range .secrets}}{{println .name}}{{end}}' }}'
     | grep ^default-token-
   register: sa_secret
 - name: get heapster service account ca
   command: >
-    {{ openshift.common.client_binary }} -n '{{ metrics_project }}'
+    {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}'
     get 'secret/{{ sa_secret.stdout }}'
     --template '{{ '{{index .data "ca.crt"}}' }}'
   register: sa_secret
@@ -54,12 +54,12 @@
       heapster.cert: "{{ heapster_secret.results[0].stdout }}"
       heapster.key: "{{ heapster_secret.results[1].stdout }}"
       heapster.client-ca: "{{ sa_secret.stdout }}"
-      heapster.allowed-users: "{{ heapster_allowed_users|b64encode }}"
+      heapster.allowed-users: "{{ openshift_metrics_heapster_allowed_users|b64encode }}"
 - name: generate hawkular-metrics certificates
   include: setup_certificate.yaml
   vars:
     component: hawkular-metrics
-    hostnames: "hawkular-metrics,{{ hawkular_metrics_hostname }}"
+    hostnames: "hawkular-metrics,{{ openshift_metrics_hawkular_metrics_hostname }}"
 - name: generate hawkular-cassandra certificates
   include: setup_certificate.yaml
   vars:
diff --git a/roles/openshift_metrics/tasks/generate_rolebindings.yaml b/roles/openshift_metrics/tasks/generate_rolebindings.yaml
index d1bc7374a..9a72b24fe 100644
--- a/roles/openshift_metrics/tasks/generate_rolebindings.yaml
+++ b/roles/openshift_metrics/tasks/generate_rolebindings.yaml
@@ -27,4 +27,4 @@
     subjects:
     - kind: ServiceAccount
       name: heapster
-      namespace: "{{ metrics_project }}"
+      namespace: "{{ openshift_metrics_project }}"
diff --git a/roles/openshift_metrics/tasks/install_hawkular.yaml b/roles/openshift_metrics/tasks/install_hawkular.yaml
index 670396f6e..9a39cce34 100644
--- a/roles/openshift_metrics/tasks/install_hawkular.yaml
+++ b/roles/openshift_metrics/tasks/install_hawkular.yaml
@@ -10,35 +10,35 @@
   vars:
     node: "{{ item }}"
     master: "{{ (item == '1')|string|lower }}"
-  with_sequence: count={{ hawkular_cassandra_nodes }}
+  with_sequence: count={{ openshift_metrics_hawkular_cassandra_nodes }}
 - name: generate hawkular-cassandra persistent volume claims
   template:
     src: pvc.j2
     dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml"
   vars:
-    obj_name: "{{ hawkular_cassandra_pv_prefix }}-{{ item }}"
+    obj_name: "{{ openshift_metrics_hawkular_cassandra_pv_prefix }}-{{ item }}"
     labels:
       metrics-infra: hawkular-cassandra
     access_modes:
     - ReadWriteOnce
-    size: "{{ hawkular_cassandra_pv_size }}"
-  with_sequence: count={{ hawkular_cassandra_nodes }}
-  when: hawkular_cassandra_storage_type == 'pv'
+    size: "{{ openshift_metrics_hawkular_cassandra_pv_size }}"
+  with_sequence: count={{ openshift_metrics_hawkular_cassandra_nodes }}
+  when: openshift_metrics_hawkular_cassandra_storage_type == 'pv'
 - name: generate hawkular-cassandra persistent volume claims (dynamic)
   template:
     src: pvc.j2
     dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml"
   vars:
-    obj_name: "{{ hawkular_cassandra_pv_prefix }}-{{ item }}"
+    obj_name: "{{ openshift_metrics_hawkular_cassandra_pv_prefix }}-{{ item }}"
     labels:
       metrics-infra: hawkular-cassandra
     annotations:
       volume.alpha.kubernetes.io/storage-class: dynamic
     access_modes:
     - ReadWriteOnce
-    size: "{{ hawkular_cassandra_pv_size }}"
-  with_sequence: count={{ hawkular_cassandra_nodes }}
-  when: hawkular_cassandra_storage_type == 'dynamic'
+    size: "{{ openshift_metrics_hawkular_cassandra_pv_size }}"
+  with_sequence: count={{ openshift_metrics_hawkular_cassandra_nodes }}
+  when: openshift_metrics_hawkular_cassandra_storage_type == 'dynamic'
 - name: generate the hawkular-metrics route
   template:
     src: route.j2
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml
index e9a5fbebd..79aae1e0b 100644
--- a/roles/openshift_metrics/tasks/main.yaml
+++ b/roles/openshift_metrics/tasks/main.yaml
@@ -1,13 +1,13 @@
 ---
 - name: check that hawkular_metrics_hostname is set
-  fail: msg='the hawkular_metrics_hostname variable is required'
-  when: "{{ hawkular_metrics_hostname is not defined }}"
-- name: check the value of hawkular_cassandra_storage_type
+  fail: msg='the openshift_metrics_hawkular_metrics_hostname variable is required'
+  when: "{{ openshift_metrics_hawkular_metrics_hostname is not defined }}"
+- name: check the value of openshift_metrics_hawkular_cassandra_storage_type
   fail:
     msg: >
-      hawkular_cassandra_storage_type ({{ hawkular_cassandra_storage_type }})
+      openshift_metrics_hawkular_cassandra_storage_type ({{ openshift_metrics_hawkular_cassandra_storage_type }})
       is invalid, must be one of: emptydir, pv, dynamic
-  when: hawkular_cassandra_storage_type not in hawkular_cassandra_storage_types
+  when: openshift_metrics_hawkular_cassandra_storage_type not in openshift_metrics_hawkular_cassandra_storage_types
 - name: Install Metrics
   include: "{{ role_path }}/tasks/install_{{ include_file }}.yaml"
   with_items:
@@ -18,7 +18,7 @@
     loop_var: include_file
 - name: create objects
   command: >
-    {{ openshift.common.client_binary }} -n '{{ metrics_project }}'
+    {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}'
     apply -f {{ item }}
   with_fileglob:
   - "{{ mktemp.stdout }}/templates/*.yaml"