diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-04-06 14:55:00 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-04-06 21:52:14 +0000 |
| commit | 32996160573991e7c42face2d23d7f1d9b5c1f27 (patch) | |
| tree | bd113a39dc347fee791f15aaeb5036103e3b1f22 | |
| parent | bc4ab949d988f12f8e896436b56bbc8b92d815db (diff) | |
Fixes delorean repo update on undercloud
Previous fix to update delorean repo on undercloud was always failing
because the operations passed to virt-customize were not in a list type.
JIRA: APEX-565
Change-Id: Ic883309ac1c3aa6027dc252635e404e5355c269d
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 3812d0987d078a8a0ad93724e8188994b7579e50)
| -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 " |