Skip to content

Commit

Permalink
Fail edpm_network_config when there are schema errors
Browse files Browse the repository at this point in the history
Currently when there are schema errors in os-net-config,
the logs are updated and no failure happens.
Updating this behaviour so that user can fix errors and re-run role
  • Loading branch information
vcandapp committed Aug 5, 2024
1 parent 9a2cec3 commit 71b307b
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 5 deletions.
10 changes: 9 additions & 1 deletion plugins/modules/edpm_os_net_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ def _run_os_net_config(config_file, cleanup=False, debug=False,
argv.append('--provider nmstate')
else:
argv.append('--provider ifcfg')
# Force exit on SCHEMA validation errors
argv.append('--exit-on-validation-errors')
cmd = " ".join(argv)

# Apply the provided network configuration
Expand Down Expand Up @@ -207,7 +209,7 @@ def main():
detailed_exit_codes = args['detailed_exit_codes']
safe_defaults = args['safe_defaults']
use_nmsate = args['use_nmstate']
return_codes = [0]
return_codes = [0,1]
if detailed_exit_codes:
return_codes.append(2)

Expand All @@ -230,6 +232,12 @@ def main():
# an operator to ssh the node and debug if needed.
_apply_safe_defaults(debug, module.check_mode,
use_nmstate=use_nmsate)
elif run.returncode == 1:
results['failed'] = True
results['rc'] = run.returncode
results['msg'] = ("Running %s failed due to invalid args or SCHEMA "
"validation error. Skipping apply_safe_defaults." % (
cmd, run.returncode))
else:
results['rc'] = 0
results['msg'] = ("Successfully run %s." % cmd)
Expand Down
26 changes: 22 additions & 4 deletions roles/edpm_network_config/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,25 @@
- name: Load system-roles.network tasks [nmstate]
ansible.builtin.include_role:
name: "{{ lookup('ansible.builtin.env', 'EDPM_SYSTEMROLES', default='fedora.linux_system_roles') + '.network' }}"
- name: Load edpm_network_config tasks [os-net-config]
ansible.builtin.include_tasks:
file: network_config.yml
when: edpm_network_config_tool == 'os-net-config'

- name: Disable auto-configuration of all interfaces by NetworkManager
when: ( edpm_bootstrap_network_service == 'NetworkManager' ) and
( edpm_network_config_tool == 'os-net-config' )
become: true
block:
- name: Set 'no-auto-default' in /etc/NetworkManager/NetworkManager.conf
community.general.ini_file:
path: /etc/NetworkManager/NetworkManager.conf
state: present
no_extra_spaces: true
section: main
option: no-auto-default
value: "*"
backup: true
- name: Restart NetworkManager
ansible.builtin.systemd:
name: NetworkManager
state: restarted
- name: Load edpm_network_config tasks for os-net-config
ansible.builtin.include_tasks:
file: network_config.yml

0 comments on commit 71b307b

Please sign in to comment.