summaryrefslogtreecommitdiffstats
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
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.
-rw-r--r--roles/cockpit/defaults/main.yml1
-rw-r--r--roles/cockpit/tasks/firewall.yml8
-rw-r--r--roles/etcd/defaults/main.yaml2
-rw-r--r--roles/etcd/tasks/firewall.yml8
-rw-r--r--roles/nuage_master/defaults/main.yml1
-rw-r--r--roles/nuage_master/tasks/firewall.yml8
-rw-r--r--roles/nuage_node/defaults/main.yml2
-rw-r--r--roles/nuage_node/tasks/firewall.yml8
-rw-r--r--roles/openshift_hosted/tasks/registry/firewall.yml8
-rw-r--r--roles/openshift_hosted/tasks/router/firewall.yml8
-rw-r--r--roles/openshift_loadbalancer/defaults/main.yml2
-rw-r--r--roles/openshift_loadbalancer/tasks/firewall.yml8
-rw-r--r--roles/openshift_master/defaults/main.yml4
-rw-r--r--roles/openshift_master/tasks/firewall.yml8
-rw-r--r--roles/openshift_node/defaults/main.yml5
-rw-r--r--roles/openshift_node/tasks/firewall.yml8
-rw-r--r--roles/openshift_storage_nfs/defaults/main.yml1
-rw-r--r--roles/openshift_storage_nfs/tasks/firewall.yml8
18 files changed, 41 insertions, 57 deletions
diff --git a/roles/cockpit/defaults/main.yml b/roles/cockpit/defaults/main.yml
index d8231eced..97b00db04 100644
--- a/roles/cockpit/defaults/main.yml
+++ b/roles/cockpit/defaults/main.yml
@@ -3,4 +3,3 @@ r_cockpit_os_firewall_deny: []
r_cockpit_os_firewall_allow:
- service: cockpit-ws
port: 9090/tcp
- cond: true
diff --git a/roles/cockpit/tasks/firewall.yml b/roles/cockpit/tasks/firewall.yml
index b60cf7b28..0e253a9f5 100644
--- a/roles/cockpit/tasks/firewall.yml
+++ b/roles/cockpit/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_cockpit_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_cockpit_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_cockpit_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_cockpit_os_firewall_deny }}"
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 }}"
diff --git a/roles/nuage_master/defaults/main.yml b/roles/nuage_master/defaults/main.yml
index 7b5015a02..2aed521da 100644
--- a/roles/nuage_master/defaults/main.yml
+++ b/roles/nuage_master/defaults/main.yml
@@ -5,4 +5,3 @@ r_nuage_master_os_firewall_deny: []
r_nuage_master_os_firewall_allow:
- service: openshift-monitor
port: "{{ nuage_mon_rest_server_port }}/tcp"
- cond: true
diff --git a/roles/nuage_master/tasks/firewall.yml b/roles/nuage_master/tasks/firewall.yml
index b47699966..b4da2ac83 100644
--- a/roles/nuage_master/tasks/firewall.yml
+++ b/roles/nuage_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_nuage_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_nuage_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_nuage_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_nuage_master_os_firewall_deny }}"
diff --git a/roles/nuage_node/defaults/main.yml b/roles/nuage_node/defaults/main.yml
index c31c8a7dd..7a71273e7 100644
--- a/roles/nuage_node/defaults/main.yml
+++ b/roles/nuage_node/defaults/main.yml
@@ -5,7 +5,5 @@ r_nuage_node_os_firewall_deny: []
r_nuage_node_os_firewall_allow:
- service: vxlan
port: 4789/udp
- cond: true
- service: nuage-monitor
port: "{{ nuage_mon_rest_server_port }}/tcp"
- cond: true
diff --git a/roles/nuage_node/tasks/firewall.yml b/roles/nuage_node/tasks/firewall.yml
index cb0bffb09..008f3a95b 100644
--- a/roles/nuage_node/tasks/firewall.yml
+++ b/roles/nuage_node/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_nuage_node_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_nuage_node_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_nuage_node_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_nuage_node_os_firewall_deny }}"
diff --git a/roles/openshift_hosted/tasks/registry/firewall.yml b/roles/openshift_hosted/tasks/registry/firewall.yml
index ea9f50047..f48eb3b12 100644
--- a/roles/openshift_hosted/tasks/registry/firewall.yml
+++ b/roles/openshift_hosted/tasks/registry/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_hosted_registry_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_hosted_registry_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_hosted_registry_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_hosted_registry_os_firewall_deny }}"
diff --git a/roles/openshift_hosted/tasks/router/firewall.yml b/roles/openshift_hosted/tasks/router/firewall.yml
index f8643aab7..fd9a9c2e7 100644
--- a/roles/openshift_hosted/tasks/router/firewall.yml
+++ b/roles/openshift_hosted/tasks/router/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_hosted_router_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_hosted_router_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_hosted_router_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_hosted_router_os_firewall_deny }}"
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 }}"
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 }}"
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index 52218f683..92237757c 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -3,16 +3,13 @@ r_openshift_node_os_firewall_deny: []
r_openshift_node_os_firewall_allow:
- service: Kubernetes kubelet
port: 10250/tcp
- cond: true
- service: http
port: 80/tcp
- cond: true
- service: https
port: 443/tcp
- cond: true
- service: OpenShift OVS sdn
port: 4789/udp
- when: openshift.common.use_openshift_sdn | default(true) | bool
+ cond: openshift.common.use_openshift_sdn | default(true) | bool
- service: Calico BGP Port
port: 179/tcp
cond: "{{ openshift.common.use_calico | bool }}"
diff --git a/roles/openshift_node/tasks/firewall.yml b/roles/openshift_node/tasks/firewall.yml
index 323eaae70..492dcee1d 100644
--- a/roles/openshift_node/tasks/firewall.yml
+++ b/roles/openshift_node/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_node_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_node_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_node_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_node_os_firewall_deny }}"
diff --git a/roles/openshift_storage_nfs/defaults/main.yml b/roles/openshift_storage_nfs/defaults/main.yml
index f6c0a1108..1e9265b00 100644
--- a/roles/openshift_storage_nfs/defaults/main.yml
+++ b/roles/openshift_storage_nfs/defaults/main.yml
@@ -3,7 +3,6 @@ r_openshift_storage_nfs_os_firewall_deny: []
r_openshift_storage_nfs_os_firewall_allow:
- service: nfs
port: "2049/tcp"
- cond: true
openshift:
hosted:
diff --git a/roles/openshift_storage_nfs/tasks/firewall.yml b/roles/openshift_storage_nfs/tasks/firewall.yml
index 224042d1e..9bca80b40 100644
--- a/roles/openshift_storage_nfs/tasks/firewall.yml
+++ b/roles/openshift_storage_nfs/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_storage_nfs_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_storage_nfs_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_storage_nfs_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_storage_nfs_os_firewall_deny }}"