summaryrefslogtreecommitdiffstats
path: root/roles/etcd
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-08-30 21:36:02 -0400
committerGitHub <noreply@github.com>2017-08-30 21:36:02 -0400
commit801a90ba2581216b6204fd05915cff3f1900b637 (patch)
treefda85f8fa74e93f05484321bc66c0b08ddcec813 /roles/etcd
parentcab9134c4ff7dcc52dda75c94e13874d9ec9083d (diff)
parent08e0b6bba1f9bf9e72a713af8e4a3c663a8f03c9 (diff)
downloadopenshift-801a90ba2581216b6204fd05915cff3f1900b637.tar.gz
openshift-801a90ba2581216b6204fd05915cff3f1900b637.tar.bz2
openshift-801a90ba2581216b6204fd05915cff3f1900b637.tar.xz
openshift-801a90ba2581216b6204fd05915cff3f1900b637.zip
Merge pull request #5270 from kwoodson/etcd_firewall_defaults
etcd role will default to global firewall settings when set.
Diffstat (limited to 'roles/etcd')
-rw-r--r--roles/etcd/defaults/main.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index d12d7a358..3cc2bbb18 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -1,6 +1,6 @@
---
-r_etcd_firewall_enabled: True
-r_etcd_use_firewalld: False
+r_etcd_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
+r_etcd_use_firewalld: "{{ os_firewall_use_firewalld | default(Falsel) }}"
etcd_initial_cluster_state: new
etcd_initial_cluster_token: etcd-cluster-1