diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-04-07 01:11:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-07 01:11:50 +0000 |
| commit | 4972269e3440b75e6e4b03c512f6d3cfa4fa6bf4 (patch) | |
| tree | b4e83a1ed5d1e8cbdcafdf1ed505d4f80e158305 | |
| parent | 7c762620eb801faecc4f041f3a77561e3b9bd5ee (diff) | |
| parent | 32996160573991e7c42face2d23d7f1d9b5c1f27 (diff) | |
Merge "Fixes delorean repo update on undercloud" into stable/fraser
| -rw-r--r-- | apex/tests/test_apex_undercloud.py | 2 | ||||
| -rw-r--r-- | apex/undercloud/undercloud.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/tests/test_apex_undercloud.py b/apex/tests/test_apex_undercloud.py index 9e2752ad..fce7a557 100644 --- a/apex/tests/test_apex_undercloud.py +++ b/apex/tests/test_apex_undercloud.py @@ -225,5 +225,5 @@ class TestUndercloud(unittest.TestCase): "https://trunk.rdoproject.org/centos7-{}" "/current-tripleo/delorean.repo".format( constants.DEFAULT_OS_VERSION)) - test_ops = {'--run-command': download_cmd} + test_ops = [{'--run-command': download_cmd}] mock_vutils.virt_customize.assert_called_with(test_ops, uc.volume) diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 2972351c..d76174b0 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -276,7 +276,7 @@ class Undercloud: cmd = ("curl -L -f -o " "/etc/yum.repos.d/deloran.repo {}".format(delorean_repo)) try: - virt_utils.virt_customize({constants.VIRT_RUN_CMD: cmd}, + virt_utils.virt_customize([{constants.VIRT_RUN_CMD: cmd}], self.volume) except Exception: logging.warning("Failed to download and update delorean repo " |