From: juraj.linkes <jlinkes@cisco.com>
Date: Fri, 13 Oct 2017 13:23:45 +0000 (+0200)
Subject: Updated grep regexs for 1710 honeycomb ip and port
X-Git-Tag: opnfv-6.1.0~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f11dd67c173a7e03f2eb0030cc90c5591f034f73;p=fds.git

Updated grep regexs for 1710 honeycomb ip and port

Change-Id: I4f1247e9a946e5c11268b3bfac88ec9487fc8782
Signed-off-by: juraj.linkes <jlinkes@cisco.com>
---

diff --git a/scripts/resource_cleanup.sh b/scripts/resource_cleanup.sh
index 1f3388f..e3ff599 100755
--- a/scripts/resource_cleanup.sh
+++ b/scripts/resource_cleanup.sh
@@ -253,8 +253,8 @@ clean_overcloud_resource() {
             sleep 1
             service honeycomb start &> /dev/null
             echo "$HOSTNAME: starting honeycomb"
-            HC_IP=$(grep -r restconf-binding-address /opt/honeycomb/config/ | grep -Eo "$IPV4_REGEX")
-            HC_PORT=$(grep -r restconf-port /opt/honeycomb/config/ | grep -Eo [0-9]+)
+            HC_IP=$(grep -rhPo "restconf-binding-address[^0-9]*\K($IPV4_REGEX)" /opt/honeycomb/config/)
+            HC_PORT=$(grep -rhPo "restconf-port[^0-9]*\K([0-9]*)" /opt/honeycomb/config/)
             for i in $(seq 1 $FDIO_TIMEOUT)
             do
                 sleep 1