Merge "Fix dry-run for NetworkConfig tasks" into stable/train
This commit is contained in:
commit
8d5bf63bdb
|
@ -569,17 +569,23 @@ outputs:
|
||||||
bridge_name: "{{ neutron_physical_bridge_name }}"
|
bridge_name: "{{ neutron_physical_bridge_name }}"
|
||||||
interface_name: "{{ neutron_public_interface_name }}"
|
interface_name: "{{ neutron_public_interface_name }}"
|
||||||
register: NetworkConfig_result
|
register: NetworkConfig_result
|
||||||
|
when:
|
||||||
|
- not ansible_check_mode
|
||||||
failed_when: NetworkConfig_result.rc is not defined
|
failed_when: NetworkConfig_result.rc is not defined
|
||||||
|
|
||||||
- name: Write rc of NetworkConfig script
|
- name: Write rc of NetworkConfig script
|
||||||
copy:
|
copy:
|
||||||
content: "{{ NetworkConfig_result.rc }}"
|
content: "{{ NetworkConfig_result.rc }}"
|
||||||
dest: /var/lib/tripleo-config/os-net-config.returncode
|
dest: /var/lib/tripleo-config/os-net-config.returncode
|
||||||
|
when:
|
||||||
|
- NetworkConfig_result.rc is defined
|
||||||
|
|
||||||
- name: NetworkConfig stdout
|
- name: NetworkConfig stdout
|
||||||
debug:
|
debug:
|
||||||
var: NetworkConfig_result.stderr_lines
|
var: NetworkConfig_result.stderr_lines
|
||||||
failed_when: NetworkConfig_result.rc != 0
|
failed_when: NetworkConfig_result.rc != 0
|
||||||
|
when:
|
||||||
|
- NetworkConfig_result.rc is defined
|
||||||
|
|
||||||
# os-net-config currently relies on the legacy network
|
# os-net-config currently relies on the legacy network
|
||||||
# so we need to ensure it's enabled on boot. This should
|
# so we need to ensure it's enabled on boot. This should
|
||||||
|
|
Loading…
Reference in New Issue