openstack
/
tripleo-ansible
Code Issues Proposed changes

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 c2aeccc01c)
This commit is contained in:
Harald Jensås 2021-03-10 05:27:52 +01:00
parent ac6cc2ae0d
commit 0aef9a7faa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_ansible/roles/tripleo_network_config/tasks/main.yml
View File

@ -102,5 +102,5 @@
- (tripleo_network_config_action == "CREATE") or - (tripleo_network_config_action == "CREATE") or
("UPDATE" in tripleo_network_config_network_deployment_actions) or ("UPDATE" in tripleo_network_config_network_deployment_actions) or
(os_net_config_returncode_stat.stat.exists and (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) (not os_net_config_returncode_stat.stat.exists)