From 72d9519f78e5d023a47eede2b93fe5bddae74e7b Mon Sep 17 00:00:00 2001
From: Radoslaw Smigielski <radoslaw.smigielski@nokia.com>
Date: Tue, 6 Nov 2018 12:52:52 +0100
Subject: [PATCH] Simplify some scripts and remove some unnecessary jq usage

jq is powerful tool but in some points it's kind of overkill and jq
can be replaced by simple openstack command with appropriate options.

Change-Id: I5cb09b953d725482a525be16be31f0e2ecf42966
---
 tasks/common/undercloud_validate_upgrade.yaml | 2 +-
 tasks/upgrade/undercloud_ssl_camap.yaml       | 2 +-
 templates/node_upgrade_post.sh.j2             | 2 +-
 templates/nova_actions_check.sh.j2            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/common/undercloud_validate_upgrade.yaml b/tasks/common/undercloud_validate_upgrade.yaml
index 43ae7d2c..bab11658 100644
--- a/tasks/common/undercloud_validate_upgrade.yaml
+++ b/tasks/common/undercloud_validate_upgrade.yaml
@@ -70,7 +70,7 @@
     - name: assert UC services started
       shell: |
         source {{ undercloud_rc }} ;
-        timeout 10 openstack stack list -f json | jq -c -r '.[]|.["Stack Name"]'
+        timeout 10 openstack stack list -f value -c "Stack Name"
       ignore_errors: true
       register: oc_name
       until: oc_name.stdout.find('{{ overcloud_stack_name }}') != -1
diff --git a/tasks/upgrade/undercloud_ssl_camap.yaml b/tasks/upgrade/undercloud_ssl_camap.yaml
index d54f171b..7e925d2b 100644
--- a/tasks/upgrade/undercloud_ssl_camap.yaml
+++ b/tasks/upgrade/undercloud_ssl_camap.yaml
@@ -87,7 +87,7 @@
     - name: register overcloud nodes ip address
       shell: |
         source {{ undercloud_rc }}
-        openstack server list -f json | jq -r -c '.[] | .Networks' | grep -oP '[0-9.]+'
+        openstack server list -f value -c Networks |  grep -oP '[0-9.]+'
       register: node_ip
 
     - name: copy certificate to the overcloud nodes and update the trusted store
diff --git a/templates/node_upgrade_post.sh.j2 b/templates/node_upgrade_post.sh.j2
index 7a6f118e..5275670f 100644
--- a/templates/node_upgrade_post.sh.j2
+++ b/templates/node_upgrade_post.sh.j2
@@ -88,7 +88,7 @@ while true; do
         echo "Block migrating {{ instance }} back to {{ node_name }} ..."
         nova live-migration --block-migrate {{ instance }} {{ node_name }}
     fi
-    INSTANCE_HOST=$(openstack server show {{ instance }} -f json | jq -r -c '. | .["OS-EXT-SRV-ATTR:host"]')
+    INSTANCE_HOST=$(openstack server show {{ instance }} -f value -c OS-EXT-SRV-ATTR:host)
     if [ $INSTANCE_HOST == '{{ node_name }}' ]; then
         break
     fi
diff --git a/templates/nova_actions_check.sh.j2 b/templates/nova_actions_check.sh.j2
index 11a1639d..dea39218 100644
--- a/templates/nova_actions_check.sh.j2
+++ b/templates/nova_actions_check.sh.j2
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eux
 
-SERVER_ID=$(openstack server list -f json | jq -r -c '.[0] | .ID')
+SERVER_ID=$(openstack server list -f value -c ID --limit 1)
 SERVER_FIP=$(openstack server show -f json ${SERVER_ID} | jq -r -c '.addresses' | grep -oP ',.*' | sed s/,\ //)
 SERVER_SSH_USER={{ workload_user }}