From 2979a005c949b09259d0099580fe3e8a3faebaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Wed, 10 Mar 2021 05:27:52 +0100 Subject: [PATCH] Fix tripleo_network config conditional The conditional used in the NetworkConfig block always evaluates to conclude that network config should be applied. Use | int filter on the slurped os-net-config return code file so that the condition does not always evaluate to False. Conflicts: tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml tripleo_ansible/roles/tripleo_network_config/molecule/default/prepare.yml tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml The original patch also fixed molecule tests, this part has been removed in the cherry-pick. Closes-Bug: #1918372 Change-Id: Ia4d663cd298556c8143eab6e799e68c81bc8235e (cherry picked from commit c2aeccc01c76afa53e759fd51ed7d50eb987fd08) --- tripleo_ansible/roles/tripleo-network-config/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo-network-config/tasks/main.yml b/tripleo_ansible/roles/tripleo-network-config/tasks/main.yml index da0400042..568e3fa25 100644 --- a/tripleo_ansible/roles/tripleo-network-config/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-network-config/tasks/main.yml @@ -106,5 +106,5 @@ - (tripleo_network_config_action == "CREATE") or ("UPDATE" in tripleo_network_config_network_deployment_actions) or (os_net_config_returncode_stat.stat.exists and - ((os_net_config_returncode_slurp.content | b64decode) != 0)) or + ((os_net_config_returncode_slurp.content | b64decode | int) != 0)) or (not os_net_config_returncode_stat.stat.exists)