openstack
/
tripleo-common
Code Issues Proposed changes

image_uploader: use /v2 suffix to validate SSL 

When testing if the registry is secure or not, let's use the actual
registry URL which containers /v2 so we don't hit 404 when Satellite is
used and provides another web server configuration.

Change-Id: I356d00b2c730903c9276b19a676cdd524121945b
Closes-Bug: #1805184
This commit is contained in:
Emilien Macchi 2018-11-26 17:00:45 -05:00
parent 7caf2065ba
commit 3a0cc642b5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/image/image_uploader.py
View File

@ -523,7 +523,7 @@ class BaseImageUploader(object):
if registry_host in self.insecure_registries:
return True
try:
requests.get('https://%s/' % registry_host)
requests.get('https://%s/v2' % registry_host)
except requests.exceptions.SSLError:
self.insecure_registries.add(registry_host)
return True

8
tripleo_common/tests/image/test_image_uploader.py
View File

@ -189,7 +189,7 @@ class TestBaseImageUploader(base.TestCase):
self.assertFalse(
self.uploader.is_insecure_registry('192.0.2.0:8787'))
self.assertEqual(
'https://192.0.2.0:8787/',
'https://192.0.2.0:8787/v2',
self.requests.request_history[0].url
)
@ -202,20 +202,20 @@ class TestBaseImageUploader(base.TestCase):
self.assertFalse(
self.uploader.is_insecure_registry('192.0.2.0:8787'))
self.assertEqual(
'https://192.0.2.0:8787/',
'https://192.0.2.0:8787/v2',
self.requests.request_history[0].url
)
def test_is_insecure_registry_insecure(self):
self.requests.get(
'https://192.0.2.0:8787/',
'https://192.0.2.0:8787/v2',
exc=requests.exceptions.SSLError('ouch'))
self.assertTrue(
self.uploader.is_insecure_registry('192.0.2.0:8787'))
self.assertTrue(
self.uploader.is_insecure_registry('192.0.2.0:8787'))
self.assertEqual(
'https://192.0.2.0:8787/',
'https://192.0.2.0:8787/v2',
self.requests.request_history[0].url
)