From 2895760204f50daba1bf87446c391bf3728a3b2f Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Tue, 11 Aug 2020 14:03:22 -0500
Subject: [PATCH] Don't use jq in rally containers

jq is not a part of xrally-openstack container, so using something worse
for the same instead of producing an extra image.

Change-Id: I0f22488fcb9f0247e6279e6754393f22b2dd0251
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 neutron/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutron/values.yaml b/neutron/values.yaml
index f2f7e52ac7..e4aba783f8 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -842,7 +842,7 @@ conf:
         openstack router unset --external-gateway $ROUTER
         openstack router set --disable --no-ha $ROUTER
 
-        SUBNS=$(openstack router show $ROUTER -c interfaces_info --format=value | jq .[].subnet_id | tr -d '\r\"')
+        SUBNS=$(openstack router show $ROUTER -c interfaces_info --format=value | python -m json.tool | grep -oP '(?<="subnet_id": ")[a-f0-9\-]{36}(?=")' | sort | uniq)
         for SUBN in $SUBNS
         do
           openstack router remove subnet $ROUTER $SUBN