Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ufw: fix default (again) #55004

Merged
merged 3 commits into from
Apr 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 3 additions & 8 deletions lib/ansible/modules/system/ufw.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,9 @@ def ufw_version():
current_default_values["incoming"] = extract.group(1)
current_default_values["outgoing"] = extract.group(2)
current_default_values["routed"] = extract.group(3)
if params['direction'] is None:
for v in current_default_values.values():
if v not in (value, 'disabled'):
changed = True
else:
v = current_default_values[params['direction']]
if v not in (value, 'disabled'):
changed = True
v = current_default_values[params['direction'] or 'incoming']
if v not in (value, 'disabled'):
changed = True
else:
changed = True
else:
Expand Down
1 change: 0 additions & 1 deletion test/integration/targets/ufw/aliases
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ skip/docker
needs/root
destructive
needs/target/setup_epel
unstable # the test fails when run in the group, but not by itself
29 changes: 14 additions & 15 deletions test/integration/targets/ufw/tasks/tests/global-state.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,30 @@
default: deny
direction: incoming
register: default_change_2
- name: Default (change all, check mode)
- name: Default (change incoming implicitly, check mode)
ufw:
default: allow
check_mode: yes
register: default_change_all_check
- name: Default (change all)
register: default_change_implicit_check
- name: Default (change incoming implicitly)
ufw:
default: allow
register: default_change_all
register: default_change_implicit
- name: Get defaults
shell: |
ufw status verbose | grep "^Default:"
register: ufw_defaults_change_all
register: ufw_defaults_change_implicit
environment:
LC_ALL: C
- name: Default (change all, idempotent, check mode)
- name: Default (change incoming implicitly, idempotent, check mode)
ufw:
default: allow
check_mode: yes
register: default_change_all_idem_check
- name: Default (change all, idempotent)
register: default_change_implicit_idem_check
- name: Default (change incoming implicitly, idempotent)
ufw:
default: allow
register: default_change_all_idem
register: default_change_implicit_idem
- assert:
that:
- default_check is changed
Expand All @@ -143,9 +143,8 @@
- default_change is changed
- "'allow (incoming)' in ufw_defaults_change.stdout"
- default_change_2 is changed
- default_change_all_check is changed
- default_change_all is changed
- default_change_all_idem_check is not changed
- default_change_all_idem is not changed
- "'allow (incoming)' in ufw_defaults_change_all.stdout"
- "'allow (outgoing)' in ufw_defaults_change_all.stdout"
- default_change_implicit_check is changed
- default_change_implicit is changed
- default_change_implicit_idem_check is not changed
- default_change_implicit_idem is not changed
- "'allow (incoming)' in ufw_defaults_change_implicit.stdout"