From 5871aa63d8e6e3ac3e42ebaa2abc2b5c537729cc Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Fri, 4 Oct 2019 18:20:57 +0000
Subject: [PATCH] Fix port info lookup parsing

The output format for "openstack port show" has changed breaking the
octavia deployment ansible. This patch changes the output format to json
and uses json_query to parse out the results.

Closes-Bug: #1846399
Change-Id: I3b5c989259fd4347c41d392ad79bfd6b9459d605
---
 .../tasks/netport.yml                         | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml b/tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml
index 4250aca7c..c82ea1a9a 100644
--- a/tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml
+++ b/tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml
@@ -37,22 +37,23 @@
   set_fact:
     mgmt_port_mac: "{{ out_mgmt_port_mac.stdout }}"
 
-- name: get management port ip
+- name: get fixed ip info
   shell: |
-    set -o pipefail
-    openstack port show {{ mgmt_port_id }} -f value -c fixed_ips | cut -f1 -d, | cut -f2 -d= | tr -d "'"
-  register: out_mgmt_port_ip
-  changed_when: false
+    openstack port show {{ mgmt_port_id }} -f json -c fixed_ips
+  register: mgmt_port_fixed_ip_out
 
-- name: setting fact for management network controller port IP
+- name: get management port detail result
   set_fact:
-    mgmt_port_ip: "{{ out_mgmt_port_ip.stdout }}"
+    mgmt_port_details: "{{ mgmt_port_fixed_ip_out.stdout }}"
+
+- name: parse management port details
+  set_fact:
+    mgmt_port_ip: "{{ mgmt_port_details | json_query('fixed_ips[*].ip_address') | first }}"
+    mgmt_port_subnet: "{{ mgmt_port_details | json_query('fixed_ips[*].subnet_id') | first }}"
 
 - name: get management port net mask
   shell: |
-    set -o pipefail
-    subnet_id=$(openstack port show {{ mgmt_port_id }} -f value -c fixed_ips  | cut -f2 -d, | cut -f2 -d= | tr -d "'" 2> /dev/null)
-    openstack subnet show $subnet_id -f value -c cidr 2> /dev/null
+    openstack subnet show {{ mgmt_port_subnet }} -f value -c cidr 2> /dev/null
   register: out_mgmt_subnet_cidr
 
 - name: setting fact for management subnet cidr