From b37ff8756eeb4882c7fcd5864c12b850d2983607 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 5 Jun 2024 23:04:41 +0200 Subject: Merging upstream version 1:4.14.0. Signed-off-by: Daniel Baumann --- heartbeat/openstack-info.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'heartbeat/openstack-info.in') diff --git a/heartbeat/openstack-info.in b/heartbeat/openstack-info.in index 6502f1d..876e833 100755 --- a/heartbeat/openstack-info.in +++ b/heartbeat/openstack-info.in @@ -164,10 +164,12 @@ OSInfoStats() { --format json \ --column fixed_ips \ ${port_id}") - subnet_id=$(echo "$subnet_result" | + subnet_ids=$(echo "$subnet_result" | grep -P '\"subnet_id\": \".*\",$' | grep -P -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}') - value="${value}${subnet_id}:${port_id}," + for subnet_id in $subnet_ids; do + value="${value}${subnet_id}:${port_id}," + done done value=${value%,} -- cgit v1.2.3