Andrew Bogott has submitted this change and it was merged.
Change subject: Only allow creation of proxies directly under wmflabs.org
......................................................................
Only allow creation of proxies directly under wmflabs.org
Because we can't offer valid SSL otherwise
Bug: T131270
Change-Id: I31729fee49246068a2de8728c04239f23c557641
---
M modules/openstack/files/liberty/horizon/proxy/views.py
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/files/liberty/horizon/proxy/views.py
b/modules/openstack/files/liberty/horizon/proxy/views.py
index 5b87d85..c9d4286 100644
--- a/modules/openstack/files/liberty/horizon/proxy/views.py
+++ b/modules/openstack/files/liberty/horizon/proxy/views.py
@@ -195,9 +195,10 @@
return results
def populate_domains(self, request):
- results = [(None, 'Select a domain'), ('wmflabs.org.', 'wmflabs.org.')]
- for domain in designateapi.designateclient(request).domains.list():
- results.append((domain.name, domain.name))
+ results = [('wmflabs.org.', 'wmflabs.org.')]
+ #results = [(None, 'Select a domain'), ('wmflabs.org.',
'wmflabs.org.')]
+ #for domain in designateapi.designateclient(request).domains.list():
+ #results.append((domain.name, domain.name))
return results
def clean(self):
--
To view, visit https://gerrit.wikimedia.org/r/280567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31729fee49246068a2de8728c04239f23c557641
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
