From 92f51c22ea6e051f841aca258158f11dc5694836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 8 Jun 2017 11:02:56 +0200 Subject: [PATCH] Remove deprecated docker.py insecure_registy argument Change-Id: I8c700da4d2bbf5fb7094fef522f2331ae2f42f43 Closes-Bug: #1696687 --- tripleo_common/image/image_uploader.py | 4 ++-- tripleo_common/tests/image/test_image_uploader.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tripleo_common/image/image_uploader.py b/tripleo_common/image/image_uploader.py index eb43ab967..798593d9f 100644 --- a/tripleo_common/image/image_uploader.py +++ b/tripleo_common/image/image_uploader.py @@ -103,7 +103,7 @@ class DockerImageUploader(ImageUploader): repo = pull_source + '/' + image response = [line for line in dockerc.pull(repo, - tag=tag, stream=True, insecure_registry=True)] + tag=tag, stream=True)] self.logger.debug(response) full_image = repo + ':' + tag @@ -113,7 +113,7 @@ class DockerImageUploader(ImageUploader): self.logger.debug(response) response = [line for line in dockerc.push(new_repo, - tag=tag, stream=True, insecure_registry=True)] + tag=tag, stream=True)] self.logger.debug(response) self.logger.info('Completed upload for docker image %s' % image_name) diff --git a/tripleo_common/tests/image/test_image_uploader.py b/tripleo_common/tests/image/test_image_uploader.py index 991ed2232..c5440a6d5 100644 --- a/tripleo_common/tests/image/test_image_uploader.py +++ b/tripleo_common/tests/image/test_image_uploader.py @@ -141,14 +141,14 @@ class TestDockerImageUploader(base.TestCase): self.dockermock.return_value.pull.assert_called_once_with( pull_source + '/' + image, - tag=tag, stream=True, insecure_registry=True) + tag=tag, stream=True) self.dockermock.return_value.tag.assert_called_once_with( image=pull_source + '/' + image + ':' + tag, repository=push_destination + '/' + image, tag=tag, force=True) self.dockermock.return_value.push( push_destination + '/' + image, - tag=tag, stream=True, insecure_registry=True) + tag=tag, stream=True) def test_upload_image_missing_tag(self): image = 'tripleoupstream/heat-docker-agents-centos' @@ -165,11 +165,11 @@ class TestDockerImageUploader(base.TestCase): self.dockermock.return_value.pull.assert_called_once_with( pull_source + '/' + image, - tag=expected_tag, stream=True, insecure_registry=True) + tag=expected_tag, stream=True) self.dockermock.return_value.tag.assert_called_once_with( image=pull_source + '/' + image + ':' + expected_tag, repository=push_destination + '/' + image, tag=expected_tag, force=True) self.dockermock.return_value.push( push_destination + '/' + image, - tag=expected_tag, stream=True, insecure_registry=True) + tag=expected_tag, stream=True)