Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/285288
Change subject: Point dyanmicproxy to IPs instead of hostnames ...................................................................... Point dyanmicproxy to IPs instead of hostnames Checked in labtest, result in labtestproject's testingT133554.wmflabs.org entry pointing to http://10.196.16.17:80 (which is the IP assigned in labtest for the 'control' instance) Bug: T133554 Change-Id: Ie8589110f05023dbe6bcba37b1a5c13cf02b21bd --- M modules/openstack/files/liberty/horizon/proxy/views.py 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/285288/1 diff --git a/modules/openstack/files/liberty/horizon/proxy/views.py b/modules/openstack/files/liberty/horizon/proxy/views.py index c9d4286..c051390 100644 --- a/modules/openstack/files/liberty/horizon/proxy/views.py +++ b/modules/openstack/files/liberty/horizon/proxy/views.py @@ -191,7 +191,7 @@ def populate_instances(self, request): results = [(None, 'Select an instance')] for server in nova.novaclient(request).servers.list(): - results.append((server.name, server.name)) + results.append((server.networks['public'][0], server.name)) return results def populate_domains(self, request): @@ -250,9 +250,8 @@ c.records.create(domainid, record) d = { - "backends": ['http://%s.%s.eqiad.wmflabs:%s' % ( + "backends": ['http://%s:%s' % ( data.get('backendInstance'), - request.user.project_name, data.get('backendPort') )], "domain": data.get('record') + '.' + data.get('domain').rstrip('.') -- To view, visit https://gerrit.wikimedia.org/r/285288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8589110f05023dbe6bcba37b1a5c13cf02b21bd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
