summaryrefslogtreecommitdiffstats
path: root/roles/openshift_loadbalancer
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_loadbalancer')
-rw-r--r--roles/openshift_loadbalancer/defaults/main.yml2
-rw-r--r--roles/openshift_loadbalancer/tasks/firewall.yml8
2 files changed, 4 insertions, 6 deletions
diff --git a/roles/openshift_loadbalancer/defaults/main.yml b/roles/openshift_loadbalancer/defaults/main.yml
index 4a20f5b5a..35a14b1a5 100644
--- a/roles/openshift_loadbalancer/defaults/main.yml
+++ b/roles/openshift_loadbalancer/defaults/main.yml
@@ -17,10 +17,8 @@ r_openshift_loadbalancer_os_firewall_deny: []
r_openshift_loadbalancer_os_firewall_allow:
- service: haproxy stats
port: "9000/tcp"
- cond: true
- service: haproxy balance
port: "{{ openshift_master_api_port | default(8443) }}/tcp"
- cond: true
- service: nuage mon
port: "{{ nuage_mon_rest_server_port | default(9443) }}/tcp"
cond: "{{ openshift_use_nuage | default(false) | bool }}"
diff --git a/roles/openshift_loadbalancer/tasks/firewall.yml b/roles/openshift_loadbalancer/tasks/firewall.yml
index c8628f6f8..def868134 100644
--- a/roles/openshift_loadbalancer/tasks/firewall.yml
+++ b/roles/openshift_loadbalancer/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_loadbalancer_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_loadbalancer_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_loadbalancer_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_loadbalancer_os_firewall_deny }}"