Andrew Bogott has submitted this change and it was merged.
Change subject: Proxy panel: More . juggling
......................................................................
Proxy panel: More . juggling
Now that the proxy api stores domains without a terminal '.'
we need to add it back on when reading the domains in
and before passing them off to designate.
Change-Id: I1c85e3d2870e63b4cc393b2babf7a544c50b54a8
---
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 92d2b21..5b87d85 100644
--- a/modules/openstack/files/liberty/horizon/proxy/views.py
+++ b/modules/openstack/files/liberty/horizon/proxy/views.py
@@ -65,12 +65,13 @@
def delete(self, request, obj_id):
record = obj_id[:obj_id.find('.')]
domain = obj_id[obj_id.find('.') + 1:]
+ if not domain.endswith('.'):
+ domain += '.'
# First let's make sure that this proxy is really ours to delete.
- fqdn = "%s.%s" % (record, domain)
existing_domains = [proxy.domain for proxy in get_proxy_list(request)]
- if fqdn not in existing_domains:
- raise Exception("Proxy \'%s\' is to be deleted but is not owned by
this view." % domain)
+ if obj_id not in existing_domains:
+ raise Exception("Proxy \'%s\' is to be deleted but is not owned by
this view." % obj_id)
if domain == 'wmflabs.org.':
auth = identity_generic.Password(
--
To view, visit https://gerrit.wikimedia.org/r/280578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c85e3d2870e63b4cc393b2babf7a544c50b54a8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[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
