From 017cb65beac97e86f0537ca72e859fd2ecf77cca Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 14 Oct 2015 16:17:19 +0000 Subject: [PATCH] Don't download fedora-user as part of --all build fedora-user is an optional image that is only used for testing the deployed overcloud. We shouldn't force everyone to download it as part of the --all build when in many cases it won't be needed. The option to download it is left in the client though so it can still be easily retrieved when necessary. Change-Id: I3ea6ad911a6ee411f19379060da127ef0a6e75e3 --- tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py | 1 - tripleoclient/v1/overcloud_image.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py index 1df1540a1..397d48b81 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py @@ -54,7 +54,6 @@ class TestOvercloudImageBuild(TestPluginV1): self.assertEqual(1, self.mock_ramdisk_image_create.call_count) self.assertEqual(2, self.mock_disk_image_create.call_count) - self.assertEqual(1, mock_fedora_user.call_count) @mock.patch('subprocess.call', autospec=True) @mock.patch('os.path.isfile', autospec=True) diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index 12a94ed7f..21116f50e 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -508,7 +508,6 @@ class BuildOvercloudImage(command.Command): self._build_image_ramdisk_deploy(parsed_args) self._build_image_ramdisk_agent(parsed_args) self._build_image_overcloud_full(parsed_args) - self._build_image_fedora_user(parsed_args) else: for image_type in parsed_args.image_types: {