diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-27 08:56:32 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-27 08:56:32 -0400 |
| commit | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (patch) | |
| tree | 714787ea14ac8cc432b6357f37e6d38a9dadbdfa /filter_plugins | |
| parent | 7a189730b1b6dddbed174586afe752615e60d948 (diff) | |
| parent | 57abf26c30e306d1527e92a61a94088e542bb006 (diff) | |
| download | openshift-4b734695abf9ca112c9ad3be33f03fcd1a1e7abf.tar.gz openshift-4b734695abf9ca112c9ad3be33f03fcd1a1e7abf.tar.bz2 openshift-4b734695abf9ca112c9ad3be33f03fcd1a1e7abf.tar.xz openshift-4b734695abf9ca112c9ad3be33f03fcd1a1e7abf.zip | |
Merge pull request #1896 from abutcher/openshift-loadbalancer
Separate master and haproxy config playbooks.
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 |