Browse Source

Add arbitrary firewall port config to master too

Scott Dodson 7 years ago
parent
commit
c088db59c8
2 changed files with 9 additions and 1 deletions
  1. 6 0
      inventory/byo/hosts.example
  2. 3 1
      roles/openshift_master/defaults/main.yml

+ 6 - 0
inventory/byo/hosts.example

@@ -1044,6 +1044,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # openshift_management_template_parameters={'APPLICATION_MEM_REQ': '512Mi'}
 # openshift_management_template_parameters={'APPLICATION_MEM_REQ': '512Mi'}
 #openshift_management_template_parameters: {}
 #openshift_management_template_parameters: {}
 
 
+# Firewall configuration
+# You can open additional firewall ports by defining them as a list. of service
+# names and ports/port ranges for either masters or nodes.
+#openshift_master_open_ports=[{"service":"svc1","port":"11/tcp"}]
+#openshift_node_open_ports=[{"service":"svc2","port":"12-13/tcp"},{"service":"svc3","port":"14/udp"}]
+
 # host group for masters
 # host group for masters
 [masters]
 [masters]
 ose3-master[1:3]-ansible.test.example.com
 ose3-master[1:3]-ansible.test.example.com

+ 3 - 1
roles/openshift_master/defaults/main.yml

@@ -12,7 +12,7 @@ r_openshift_master_clean_install: false
 r_openshift_master_etcd3_storage: false
 r_openshift_master_etcd3_storage: false
 r_openshift_master_os_firewall_enable: true
 r_openshift_master_os_firewall_enable: true
 r_openshift_master_os_firewall_deny: []
 r_openshift_master_os_firewall_deny: []
-r_openshift_master_os_firewall_allow:
+default_r_openshift_master_os_firewall_allow:
 - service: api server https
 - service: api server https
   port: "{{ openshift.master.api_port }}/tcp"
   port: "{{ openshift.master.api_port }}/tcp"
 - service: api controllers https
 - service: api controllers https
@@ -24,6 +24,8 @@ r_openshift_master_os_firewall_allow:
 - service: etcd embedded
 - service: etcd embedded
   port: 4001/tcp
   port: 4001/tcp
   cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
   cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
+r_openshift_master_os_firewall_allow: "{{ default_r_openshift_master_os_firewall_allow | union(openshift_master_open_ports | default([])) }}"
+
 
 
 # oreg_url is defined by user input
 # oreg_url is defined by user input
 oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"
 oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"