diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-09 10:45:55 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-09 10:45:55 -0400 |
| commit | ba96f5eaf876f6b7568ac73794a08cbe759dceee (patch) | |
| tree | ef9a38f8352079988a3ba08e4f4731f3c37de879 /roles/etcd | |
| parent | 4f9b26e8af5890b7960291497020586426e7f1fc (diff) | |
| download | openshift-ba96f5eaf876f6b7568ac73794a08cbe759dceee.tar.gz openshift-ba96f5eaf876f6b7568ac73794a08cbe759dceee.tar.bz2 openshift-ba96f5eaf876f6b7568ac73794a08cbe759dceee.tar.xz openshift-ba96f5eaf876f6b7568ac73794a08cbe759dceee.zip | |
Adding a default condition and removing unneeded defaults.
Diffstat (limited to 'roles/etcd')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | roles/etcd/tasks/firewall.yml | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 4c8d63b4c..c14137d4e 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -15,7 +15,5 @@ r_etcd_os_firewall_deny: [] r_etcd_os_firewall_allow: - service: etcd port: "{{etcd_client_port}}/tcp" - cond: true - service: etcd peering port: "{{ etcd_peer_port }}/tcp" - cond: true diff --git a/roles/etcd/tasks/firewall.yml b/roles/etcd/tasks/firewall.yml index 6088b26ff..fcfdf5227 100644 --- a/roles/etcd/tasks/firewall.yml +++ b/roles/etcd/tasks/firewall.yml @@ -7,7 +7,7 @@ action: add protocol: "{{ item.port.split('/')[1] }}" port: "{{ item.port.split('/')[0] }}" - when: item.cond + when: item.cond | default(True) with_items: "{{ r_etcd_os_firewall_allow }}" - name: Remove iptables rules @@ -16,7 +16,7 @@ action: remove protocol: "{{ item.port.split('/')[1] }}" port: "{{ item.port.split('/')[0] }}" - when: item.cond + when: item.cond | default(True) with_items: "{{ r_etcd_os_firewall_deny }}" - when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool @@ -27,7 +27,7 @@ permanent: true immediate: true state: enabled - when: item.cond + when: item.cond | default(True) with_items: "{{ r_etcd_os_firewall_allow }}" - name: Remove firewalld allow rules @@ -36,5 +36,5 @@ permanent: true immediate: true state: disabled - when: item.cond + when: item.cond | default(True) with_items: "{{ r_etcd_os_firewall_deny }}" |