diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-05-16 11:45:32 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-05-26 13:45:09 -0400 |
| commit | 57abf26c30e306d1527e92a61a94088e542bb006 (patch) | |
| tree | ab2f4d9f5e675e9e02ff05a22412878b5f9b9550 /filter_plugins | |
| parent | 643b9b30066f0130f35e9ce7b1a8a7c24a244cc7 (diff) | |
| download | openshift-57abf26c30e306d1527e92a61a94088e542bb006.tar.gz openshift-57abf26c30e306d1527e92a61a94088e542bb006.tar.bz2 openshift-57abf26c30e306d1527e92a61a94088e542bb006.tar.xz openshift-57abf26c30e306d1527e92a61a94088e542bb006.zip | |
Separate master and haproxy config playbooks.
* Move haproxy configuration to a separate openshift-loadbalancer play.
* Move the haproxy role to openshift_loadbalancer.
* Add openshift_loadbalancer* facts which drive haproxy configuration.
Diffstat (limited to 'filter_plugins')
| -rw-r--r-- | filter_plugins/oo_filters.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index e7409bf22..b81c3bf7f 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -306,7 +306,7 @@ class FilterModule(object): return string.split(separator) @staticmethod - def oo_haproxy_backend_masters(hosts): + def oo_haproxy_backend_masters(hosts, port): """ This takes an array of dicts and returns an array of dicts to be used as a backend for the haproxy role """ @@ -314,8 +314,7 @@ class FilterModule(object): for idx, host_info in enumerate(hosts): server = dict(name="master%s" % idx) server_ip = host_info['openshift']['common']['ip'] - server_port = host_info['openshift']['master']['api_port'] - server['address'] = "%s:%s" % (server_ip, server_port) + server['address'] = "%s:%s" % (server_ip, port) server['opts'] = 'check' servers.append(server) return servers |