summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-20 14:59:47 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-20 14:59:47 -0500
commitbdedb63403ea582c4aaa5f56caed302f51744de2 (patch)
treecf26be9b05f3b97dbdafb7bae109b0707da0a0d4
parentf9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3 (diff)
parent670fc1cff44bd0ad82c0dd2748c5c028f0f304ed (diff)
downloadopenshift-bdedb63403ea582c4aaa5f56caed302f51744de2.tar.gz
openshift-bdedb63403ea582c4aaa5f56caed302f51744de2.tar.bz2
openshift-bdedb63403ea582c4aaa5f56caed302f51744de2.tar.xz
openshift-bdedb63403ea582c4aaa5f56caed302f51744de2.zip
Merge pull request #1244 from abutcher/api-sysconfig
Native ha port fixes
-rw-r--r--playbooks/common/openshift-master/config.yml1
-rw-r--r--roles/haproxy/defaults/main.yml4
-rw-r--r--roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j22
3 files changed, 5 insertions, 2 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"
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2
index c9aa15b41..48bfa5f04 100644
--- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2
+++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2
@@ -1,4 +1,4 @@
-OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} --master={{ openshift.master.loopback_api_url }}:{{ openshift.master.api_port }}
+OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} --master={{ openshift.master.loopback_api_url }}
CONFIG_FILE={{ openshift_master_config_file }}
# Proxy configuration