diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
| commit | 81cb935e1817df4c633397680e963d635ed42e26 (patch) | |
| tree | dd595fab3ae4cc8f5d47dcc2297ff34def6f571c /roles/openshift_loadbalancer | |
| parent | 0514bdffca4e06144f4f81db037490d2c0fede40 (diff) | |
| parent | 6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff) | |
| download | openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2 openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz openshift-81cb935e1817df4c633397680e963d635ed42e26.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_loadbalancer')
| -rw-r--r-- | roles/openshift_loadbalancer/defaults/main.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/meta/main.yml | 5 |
2 files changed, 7 insertions, 8 deletions
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 |