diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:27 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:27 -0400 |
| commit | c4c6685855a9dc6b4c698465b799c72d6a4f13bd (patch) | |
| tree | 96372201e3dab7e2dd91612bbdec72fcbe84e4e9 /roles/openshift_loadbalancer | |
| parent | 54186e0e5022a827e6ffdeaffabcb5403bebe6e6 (diff) | |
| parent | 4b347b84711fdf0906fa3a270f51c38c23fe247e (diff) | |
| download | openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.gz openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.bz2 openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.tar.xz openshift-c4c6685855a9dc6b4c698465b799c72d6a4f13bd.zip | |
Merge pull request #1968 from abutcher/os-firewall-eval
[v2] Move os_firewall_allow from defaults to role dependencies.
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 |