diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-10 21:13:54 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-10 22:59:48 -0400 |
| commit | 7d50ffe98dfa17e3fb72627699c794843ed5295d (patch) | |
| tree | 8292dff0a7ed50f79a728da44f40d3a08b397aaa /roles/etcd | |
| parent | ba96f5eaf876f6b7568ac73794a08cbe759dceee (diff) | |
| download | openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.gz openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.bz2 openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.xz openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.zip | |
Updated README to reflect refactor. Moved firewall initialize into separate file.
Diffstat (limited to 'roles/etcd')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | roles/etcd/tasks/firewall.yml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index c14137d4e..d12d7a358 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -1,4 +1,7 @@ --- +r_etcd_firewall_enabled: True +r_etcd_use_firewalld: False + etcd_initial_cluster_state: new etcd_initial_cluster_token: etcd-cluster-1 diff --git a/roles/etcd/tasks/firewall.yml b/roles/etcd/tasks/firewall.yml index fcfdf5227..4d0f6290a 100644 --- a/roles/etcd/tasks/firewall.yml +++ b/roles/etcd/tasks/firewall.yml @@ -1,5 +1,5 @@ --- -- when: os_firewall_enabled | bool and not os_firewall_use_firewalld | bool +- when: r_etcd_firewall_enabled | bool and not r_etcd_use_firewalld | bool block: - name: Add iptables allow rules os_firewall_manage_iptables: @@ -19,7 +19,7 @@ when: item.cond | default(True) with_items: "{{ r_etcd_os_firewall_deny }}" -- when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool +- when: r_etcd_firewall_enabled | bool and r_etcd_use_firewalld | bool block: - name: Add firewalld allow rules firewalld: |