Ensure slash character for URL of dns service

Solves a pep8 warning too.

Change-Id: Ica53fc638aab9ad30b2a08acd9a9f8b77ee0304a
Closes-Bug: 1635570
This commit is contained in:
Enrique Garcia 2016-12-27 17:46:29 +01:00 committed by Graham Hayes
parent 875f6583d8
commit 1269e4a879
1 changed files with 8 additions and 3 deletions

View File

@ -34,15 +34,20 @@ def _passthrough_request(request_method, url,
Should set any necessary auth headers and SSL parameters.
"""
service = 'dns' \
''
# Set verify if a CACERT is set and SSL_NO_VERIFY isn't True
verify = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
if getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False):
verify = False
service_url = _get_service_url(request, 'dns')
request_url = '{}{}'.format(
service_url,
url if service_url.endswith('/') else ('/' + url)
)
response = request_method(
_get_service_url(request, service) + url,
request_url,
headers={'X-Auth-Token': request.user.token.id},
json=data,
verify=verify,