From a5f6e3f684a3294056d4d4e224226b90acc062e6 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Wed, 11 Jan 2017 14:07:19 -0500
Subject: additional code reviews

---
 roles/openshift_metrics/tasks/scale.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'roles/openshift_metrics/tasks/scale.yaml')

diff --git a/roles/openshift_metrics/tasks/scale.yaml b/roles/openshift_metrics/tasks/scale.yaml
index 031336a01..65f35fb46 100644
--- a/roles/openshift_metrics/tasks/scale.yaml
+++ b/roles/openshift_metrics/tasks/scale.yaml
@@ -1,27 +1,30 @@
 ---
-- shell: >
+- command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get {{object}}
-    --template='{{ '{{.spec.replicas}}' }}' -n {{openshift_metrics_project}}
+    -o jsonpath='{.spec.replicas}' -n {{openshift_metrics_project}}
   register: replica_count
   failed_when: "replica_count.rc == 1 and 'exists' not in replica_count.stderr"
   when: not ansible_check_mode
+  changed_when: no
 
-- shell: >
+- command: >
     {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig scale {{object}}
     --replicas={{desired}} -n {{openshift_metrics_project}}
   register: scale_result
   failed_when: scale_result.rc == 1 and 'exists' not in scale_result.stderr
   when:
-  - replica_count.stdout != desired
+  - replica_count.stdout != (desired | string)
   - not ansible_check_mode
+  changed_when: no
 
 - name: Waiting for {{object}} to scale to {{desired}}
-  shell: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig describe {{object}} -n {{openshift_metrics_project}} | awk -v statusrx='Pods Status:' '$0 ~ statusrx {print $3}'
+  command: >
+    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig 
+    get {{object}} -n {{openshift_metrics_project|quote}} -o jsonpath='{.status.replicas}'
   register: replica_counts
   until: replica_counts.stdout.find("{{desired}}") != -1
   retries: 30
   delay: 10
   when:
-    - replica_count.stdout != desired
+    - replica_count.stdout != (desired | string)
     - not ansible_check_mode
-- 
cgit v1.2.3