From 4958251d9189adf17f7bce47a9a699b2add0e6de Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 16 Mar 2022 12:06:00 +1000 Subject: [PATCH] Make the network_data search more inclusive It's possible to also use --networks-file instead of -n in the overcloud deploy command. This change adds a secondary search string to the awk command to ensure we capture the file regardless of which argument has been used in the overcloud deploy script. Resolves: rhbz#2064354 Change-Id: I2387d508f9dc91dc71c19ae3625fe093d33c2bc0 --- tasks/common/auxilary-facts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/common/auxilary-facts.yaml b/tasks/common/auxilary-facts.yaml index 4e29ff6d..a17f3a27 100644 --- a/tasks/common/auxilary-facts.yaml +++ b/tasks/common/auxilary-facts.yaml @@ -46,7 +46,7 @@ - name: get network-data-file shell: | - awk '/-n\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }} + awk '/-n\s/ || /--networks-file\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }} register: network_data_file - name: set network_data_file fact