diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-06 17:38:19 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-06 17:44:55 -0500 |
| commit | 71074dce4fde6d77384376dcf15c98b8316871f6 (patch) | |
| tree | 285b31cf78950185af56c9afa25e6ef52370cc3a /roles/openshift_master | |
| parent | 77008d93e094ab284d869c4bb61dbb06941fa84f (diff) | |
| download | openshift-71074dce4fde6d77384376dcf15c98b8316871f6.tar.gz openshift-71074dce4fde6d77384376dcf15c98b8316871f6.tar.bz2 openshift-71074dce4fde6d77384376dcf15c98b8316871f6.tar.xz openshift-71074dce4fde6d77384376dcf15c98b8316871f6.zip | |
start fixing os_firewall issues
- Fix missed references to old firewall scripts
- Fix variable name references that didn't get updated
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 15 |
2 files changed, 12 insertions, 15 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 10875da8e..0159afbb5 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -2,3 +2,15 @@ openshift_master_manage_service_externally: false openshift_master_debug_level: "{{ openshift_debug_level | default(0) }}" openshift_node_ips: [] +os_firewall_allow: +- service: etcd embedded + port: 4001/tcp +- service: etcd peer + port: 7001/tcp +- service: OpenShift api https + port: 8443/tcp +- service: OpenShift web console https + port: 8444/tcp +os_firewall_deny: +- service: OpenShift api http + port: 8080/tcp diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 58a8b85ba..a96184d70 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -2,21 +2,6 @@ - name: Install OpenShift Master package yum: pkg=openshift-master state=installed -- name: Configure firewall for OpenShift Master - include: "{{ role_path | dirname }}/openshift_common/tasks/firewall.yml" - allow: - - service: etcd embedded - port: 4001/tcp - - service: etcd peer - port: 7001/tcp - - service: OpenShift api https - port: 8443/tcp - - service: OpenShift web console https - port: 8444/tcp - deny: - - service: OpenShift api http - port: 8080/tcp - - name: Configure OpenShift settings lineinfile: dest: /etc/sysconfig/openshift-master |