additional cr fixes

1 files changed, 4 insertions, 56 deletions

diff --git a/roles/openshift_metrics/tasks/install_hawkular.yaml b/roles/openshift_metrics/tasks/install_hawkular.yaml
index 7c06bc1db..00f7b2554 100644
--- a/roles/openshift_metrics/tasks/install_hawkular.yaml
+++ b/roles/openshift_metrics/tasks/install_hawkular.yaml
@@ -1,9 +1,10 @@
 ---
-- shell: >
+- command: >
     {{ openshift.common.client_binary }} -n {{ openshift_metrics_project | quote }}
     --config={{ mktemp.stdout }}/admin.kubeconfig
-    get rc hawkular-metrics -o jsonpath='{.spec.replicas}' || echo 0
+    get rc hawkular-metrics -o jsonpath='{.spec.replicas}'
   register: hawkular_metrics_replica_count
+  failed_when: false
   changed_when: false
 
 - name: generate hawkular-metrics replication controller
@@ -11,60 +12,7 @@
     src: hawkular_metrics_rc.j2
     dest: "{{ mktemp.stdout }}/templates/hawkular_metrics_rc.yaml"
   vars:
-    replica_count: "{{hawkular_metrics_replica_count.stdout}}"
-  changed_when: false
-
-- shell: >
-    {{ openshift.common.client_binary }} -n {{ openshift_metrics_project | quote }}
-    --config={{ mktemp.stdout }}/admin.kubeconfig
-    get rc hawkular-cassandra-{{node}} -o jsonpath='{.spec.replicas}' || echo 0
-  vars:
-    node: "{{ item }}"
-  register: cassandra_replica_count
-  with_sequence: count={{ openshift_metrics_cassandra_replicas }}
-  changed_when: false
-
-- name: generate hawkular-cassandra replication controllers
-  template:
-    src: hawkular_cassandra_rc.j2
-    dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-rc{{ item }}.yaml"
-  vars:
-    node: "{{ item }}"
-    master: "{{ (item == '1')|string|lower }}"
-    replica_count: "{{cassandra_replica_count.results[item|int - 1].stdout}}"
-  with_sequence: count={{ openshift_metrics_cassandra_replicas }}
-  changed_when: false
-
-- name: generate hawkular-cassandra persistent volume claims
-  template:
-    src: pvc.j2
-    dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml"
-  vars:
-    obj_name: "{{ openshift_metrics_cassandra_pv_prefix }}-{{ item }}"
-    labels:
-      metrics-infra: hawkular-cassandra
-    access_modes:
-    - ReadWriteOnce
-    size: "{{ openshift_metrics_cassandra_pv_size }}"
-  with_sequence: count={{ openshift_metrics_cassandra_replicas }}
-  when: openshift_metrics_cassandra_storage_type == 'pv'
-  changed_when: false
-
-- name: generate hawkular-cassandra persistent volume claims (dynamic)
-  template:
-    src: pvc.j2
-    dest: "{{ mktemp.stdout }}/templates/hawkular-cassandra-pvc{{ item }}.yaml"
-  vars:
-    obj_name: "{{ openshift_metrics_cassandra_pv_prefix }}-{{ item }}"
-    labels:
-      metrics-infra: hawkular-cassandra
-    annotations:
-      volume.alpha.kubernetes.io/storage-class: dynamic
-    access_modes:
-    - ReadWriteOnce
-    size: "{{ openshift_metrics_cassandra_pv_size }}"
-  with_sequence: count={{ openshift_metrics_cassandra_replicas }}
-  when: openshift_metrics_cassandra_storage_type == 'dynamic'
+    replica_count: "{{hawkular_metrics_replica_count.stdout | default(0)}}"
   changed_when: false
 
 - name: read hawkular-metrics route destination ca certificate