diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 16:16:28 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 16:16:28 -0400 |
| commit | 4068abc26265d2e7ec6e5829561e1c280f724aa9 (patch) | |
| tree | 00681ae838975fef46a141a6026785b21dc837a7 /roles/os_firewall | |
| parent | b9b08f0c169ad76bbbfaee85563fd3206464945a (diff) | |
| parent | 17f949dc9815f3fa0061ae9ad0aa0dfffeb01202 (diff) | |
| download | openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.gz openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.bz2 openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.tar.xz openshift-4068abc26265d2e7ec6e5829561e1c280f724aa9.zip | |
Merge pull request #1839 from abutcher/v2-deprecations
Cleanup various deprecation warnings.
Diffstat (limited to 'roles/os_firewall')
| -rw-r--r-- | roles/os_firewall/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 12 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/roles/os_firewall/defaults/main.yml b/roles/os_firewall/defaults/main.yml index e3176e611..20413d563 100644 --- a/roles/os_firewall/defaults/main.yml +++ b/roles/os_firewall/defaults/main.yml @@ -1,3 +1,5 @@ --- os_firewall_enabled: True os_firewall_use_firewalld: True +os_firewall_allow: [] +os_firewall_deny: [] diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml index ac4600f83..241fa8823 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -52,29 +52,25 @@ port: "{{ item.port }}" permanent: false state: enabled - with_items: os_firewall_allow - when: os_firewall_allow is defined + with_items: "{{ os_firewall_allow }}" - name: Persist firewalld allow rules firewalld: port: "{{ item.port }}" permanent: true state: enabled - with_items: os_firewall_allow - when: os_firewall_allow is defined + with_items: "{{ os_firewall_allow }}" - name: Remove firewalld allow rules firewalld: port: "{{ item.port }}" permanent: false state: disabled - with_items: os_firewall_deny - when: os_firewall_deny is defined + with_items: "{{ os_firewall_deny }}" - name: Persist removal of firewalld allow rules firewalld: port: "{{ item.port }}" permanent: true state: disabled - with_items: os_firewall_deny - when: os_firewall_deny is defined + with_items: "{{ os_firewall_deny }}" diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index 3b584f8eb..070fe6a3a 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -49,8 +49,7 @@ action: add protocol: "{{ item.port.split('/')[1] }}" port: "{{ item.port.split('/')[0] }}" - with_items: os_firewall_allow - when: os_firewall_allow is defined + with_items: "{{ os_firewall_allow }}" - name: Remove iptables rules os_firewall_manage_iptables: @@ -58,5 +57,4 @@ action: remove protocol: "{{ item.port.split('/')[1] }}" port: "{{ item.port.split('/')[0] }}" - with_items: os_firewall_deny - when: os_firewall_deny is defined + with_items: "{{ os_firewall_deny }}" |