Merge "Simplify some scripts and remove some unnecessary jq usage"

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

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

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

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 }}