From 02fe40cd8b26129394ed4a8ccdf2ed3ac94cca78 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Fri, 28 Jun 2019 10:24:15 -0400 Subject: [PATCH] Run NetworkConfig if never run previously Update the condition to test if NetworkConfig should be run to also include logic to run if it was never run previously. Matches prior behavior when using a SoftwareDeployment resource Change-Id: Ibd2c7d96a6ad8d207cbb484b7e211909f897e43f --- common/deploy-steps.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 8e33e5e812..e500931c9e 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -599,11 +599,13 @@ outputs: # - If the stack_action is CREATE # - Or UPDATE is in the network_deployment_actions # - Or the previous run of NetworkConfig failed. + # - Or it has never run # This will match the prior behavior of when a Heat # SoftwareDeployment was used. when: (stack_action == "CREATE") or ("UPDATE" in network_deployment_actions) or (os_net_config_returncode_stat.stat.exists and - ((os_net_config_returncode_slurp.content | b64decode) != 0)) + ((os_net_config_returncode_slurp.content | b64decode) != 0)) or + (not os_net_config_returncode_stat.stat.exists) - name: AllNodesValidationConfig script: all_nodes_validation_script.sh