summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-08-09 10:45:55 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-08-09 10:45:55 -0400
commitba96f5eaf876f6b7568ac73794a08cbe759dceee (patch)
treeef9a38f8352079988a3ba08e4f4731f3c37de879 /roles/openshift_master
parent4f9b26e8af5890b7960291497020586426e7f1fc (diff)
downloadopenshift-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/openshift_master')
-rw-r--r--roles/openshift_master/defaults/main.yml4
-rw-r--r--roles/openshift_master/tasks/firewall.yml8
2 files changed, 4 insertions, 8 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 547801fa5..0b35c180e 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -7,16 +7,12 @@ r_openshift_master_os_firewall_deny: []
r_openshift_master_os_firewall_allow:
- service: api server https
port: "{{ openshift.master.api_port }}/tcp"
- cond: true
- service: api controllers https
port: "{{ openshift.master.controllers_port }}/tcp"
- cond: true
- service: skydns tcp
port: "{{ openshift.master.dns_port }}/tcp"
- cond: true
- service: skydns udp
port: "{{ openshift.master.dns_port }}/udp"
- cond: true
- service: etcd embedded
port: 4001/tcp
cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
diff --git a/roles/openshift_master/tasks/firewall.yml b/roles/openshift_master/tasks/firewall.yml
index 15073da98..80a91fa2e 100644
--- a/roles/openshift_master/tasks/firewall.yml
+++ b/roles/openshift_master/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_openshift_master_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_openshift_master_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_openshift_master_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_openshift_master_os_firewall_deny }}"