diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
| commit | f24cc239bcd10d51427a751044b73d1c6470b9b2 (patch) | |
| tree | ee5beb65f650c1c76466acb1da11f999504e958b /filter_plugins | |
| parent | 265daf6b65206fc17ad35e682640477d08efbc43 (diff) | |
| parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
| download | openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.gz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.bz2 openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.xz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
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 554ef440f..260dea92c 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 |