summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-06-01 12:05:36 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-06-01 12:05:36 -0400
commit4b347b84711fdf0906fa3a270f51c38c23fe247e (patch)
tree2deb24de0d9e9334f3927700eb3e14cfd07bc5aa
parent926c3d5c7b7660fa2755541ceb999961cf4cfa21 (diff)
downloadopenshift-4b347b84711fdf0906fa3a270f51c38c23fe247e.tar.gz
openshift-4b347b84711fdf0906fa3a270f51c38c23fe247e.tar.bz2
openshift-4b347b84711fdf0906fa3a270f51c38c23fe247e.tar.xz
openshift-4b347b84711fdf0906fa3a270f51c38c23fe247e.zip
Add haproxy_frontend_port to vars for openshift-loadbalancer.
-rw-r--r--playbooks/common/openshift-loadbalancer/config.yml2
-rw-r--r--roles/openshift_loadbalancer/defaults/main.yml10
-rw-r--r--roles/openshift_loadbalancer/meta/main.yml5
3 files changed, 9 insertions, 8 deletions
diff --git a/playbooks/common/openshift-loadbalancer/config.yml b/playbooks/common/openshift-loadbalancer/config.yml
index f4392173a..51cea53a3 100644
--- a/playbooks/common/openshift-loadbalancer/config.yml
+++ b/playbooks/common/openshift-loadbalancer/config.yml
@@ -1,5 +1,7 @@
---
- name: Configure load balancers
hosts: oo_lb_to_config
+ vars:
+ haproxy_frontend_port: "{{ openshift_master_api_port | default(8443) }}"
roles:
- role: openshift_loadbalancer
diff --git a/roles/openshift_loadbalancer/defaults/main.yml b/roles/openshift_loadbalancer/defaults/main.yml
index a1524cfe1..5c480f7c2 100644
--- a/roles/openshift_loadbalancer/defaults/main.yml
+++ b/roles/openshift_loadbalancer/defaults/main.yml
@@ -1,10 +1,10 @@
---
-haproxy_frontend_port: 80
+haproxy_frontend_port: 8443
haproxy_frontends:
- name: main
binds:
- - "*:80"
+ - "*:8443"
default_backend: default
haproxy_backends:
@@ -14,9 +14,3 @@ haproxy_backends:
- name: web01
address: 127.0.0.1:9000
opts: check
-
-os_firewall_allow:
-- service: haproxy stats
- port: "9000/tcp"
-- service: haproxy balance
- port: "{{ haproxy_frontend_port }}/tcp"
diff --git a/roles/openshift_loadbalancer/meta/main.yml b/roles/openshift_loadbalancer/meta/main.yml
index fe336acf7..96a737d2f 100644
--- a/roles/openshift_loadbalancer/meta/main.yml
+++ b/roles/openshift_loadbalancer/meta/main.yml
@@ -12,4 +12,9 @@ galaxy_info:
dependencies:
- role: openshift_facts
- role: os_firewall
+ os_firewall_allow:
+ - service: haproxy stats
+ port: "9000/tcp"
+ - service: haproxy balance
+ port: "{{ haproxy_frontend_port }}/tcp"
- role: openshift_repos