diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-01-20 11:14:26 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-01-20 11:24:57 -0500 |
| commit | 670fc1cff44bd0ad82c0dd2748c5c028f0f304ed (patch) | |
| tree | d4144425047e05bd3d903da161e99924066904dc | |
| parent | 4030e9ae829db084d5182b80d1d35b909ebe448a (diff) | |
| download | openshift-670fc1cff44bd0ad82c0dd2748c5c028f0f304ed.tar.gz openshift-670fc1cff44bd0ad82c0dd2748c5c028f0f304ed.tar.bz2 openshift-670fc1cff44bd0ad82c0dd2748c5c028f0f304ed.tar.xz openshift-670fc1cff44bd0ad82c0dd2748c5c028f0f304ed.zip | |
Use haproxy frontend port for os_firewall.
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | roles/haproxy/defaults/main.yml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 296176e49..9f8443599 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -219,6 +219,7 @@ hosts: oo_lb_to_config vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" + haproxy_frontend_port: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_port }}" haproxy_frontends: - name: atomic-openshift-api mode: tcp diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml index 7ba5bd485..937d94209 100644 --- a/roles/haproxy/defaults/main.yml +++ b/roles/haproxy/defaults/main.yml @@ -1,4 +1,6 @@ --- +haproxy_frontend_port: 80 + haproxy_frontends: - name: main binds: @@ -18,4 +20,4 @@ os_firewall_allow: - service: haproxy stats port: "9000/tcp" - service: haproxy balance - port: "8443/tcp" + port: "{{ haproxy_frontend_port }}/tcp" |