openstack/tripleo-common
Code Issues Proposed changes

Break out function get_undercloud_registry

Browse Source 
This is useful outside doing actual image uploads, so
get_undercloud_registry is now a standalone function with some unit
testing.

Change-Id: Ida47d14530d3ed86c30929d62f29e3c13b040178
Blueprint: container-prepare-workflow
This commit is contained in:
Steve Baker
2018-03-26 21:53:06 +00:00
committed by Emilien Macchi
parent 3651884d8b
commit ca06bedb41
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tripleo_common/image/image_uploader.py
View File

@@ -45,6 +45,15 @@ SECURE_REGISTRIES = (
)
def get_undercloud_registry():
addr = 'localhost'
if 'br-ctlplane' in netifaces.interfaces():
addrs = netifaces.ifaddresses('br-ctlplane')
if netifaces.AF_INET in addrs and addrs[netifaces.AF_INET]:
addr = addrs[netifaces.AF_INET][0].get('addr', 'localhost')
return '%s:%s' % (addr, '8787')
class ImageUploadManager(BaseImageManager):
"""Manage the uploading of image files
@@ -76,14 +85,14 @@ class ImageUploadManager(BaseImageManager):
uploads = self.load_config_files(self.UPLOADS) or []
container_images = self.load_config_files(self.CONTAINER_IMAGES) or []
upload_images = uploads + container_images
default_push_destination = self.get_ctrl_plane_ip() + ':8787'
for item in upload_images:
image_name = item.get('imagename')
uploader = item.get('uploader', 'docker')
pull_source = item.get('pull_source')
push_destination = item.get('push_destination',
default_push_destination)
push_destination = item.get('push_destination')
if not push_destination:
push_destination = get_undercloud_registry()
# This updates the parsed upload_images dict with real values
item['push_destination'] = push_destination
@@ -96,14 +105,6 @@ class ImageUploadManager(BaseImageManager):
return upload_images # simply to make test validation easier
def get_ctrl_plane_ip(self):
addr = 'localhost'
if 'br-ctlplane' in netifaces.interfaces():
addrs = netifaces.ifaddresses('br-ctlplane')
if netifaces.AF_INET in addrs and addrs[netifaces.AF_INET]:
addr = addrs[netifaces.AF_INET][0].get('addr', 'localhost')
return addr
@six.add_metaclass(abc.ABCMeta)
class ImageUploader(object):