summaryrefslogtreecommitdiffstats
path: root/apex/tests
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2019-03-20 12:08:49 -0400
committerTim Rozet <trozet@redhat.com>2019-03-20 12:19:56 -0400
commite4b1cd108f74e2cd76caf6736632d597f7436a4e (patch)
tree6210cbcff83bda6d183a793de7299a34c0c7d47d /apex/tests
parent7aac412d1bff29f1571cee6c38f1184ad127d1df (diff)
Fixes deployment on CentOS 7.6
Ceph-ansible install is moved from image builder to post undercloud install to ensure the right repo exists and it used. OVS building is now skipped as the build fails with CentOS 7.6. JIRA: APEX-658 Change-Id: I6ec253d5a88eb3cdfa38cf177b6e4b16ac5a16ed Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r--apex/tests/test_apex_overcloud_deploy.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index d4d9083..79dbf54 100644
--- a/apex/tests/test_apex_overcloud_deploy.py
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -260,7 +260,7 @@ class TestOvercloudDeploy(unittest.TestCase):
prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test')
mock_virt_utils.virt_customize.assert_called()
mock_inject_odl.assert_called()
- mock_ovs_nsh.assert_called()
+ # mock_ovs_nsh.assert_called()
@patch('apex.overcloud.deploy.c_builder')
@patch('apex.overcloud.deploy.oc_builder')
@@ -361,7 +361,7 @@ class TestOvercloudDeploy(unittest.TestCase):
ns = MagicMock()
prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test')
mock_virt_utils.virt_customize.assert_called()
- mock_ovs_nsh.assert_called()
+ # mock_ovs_nsh.assert_called()
@patch('apex.builders.overcloud_builder.inject_ovs_nsh')
@patch('apex.overcloud.deploy.utils.fetch_upstream_and_unpack')
@@ -393,7 +393,7 @@ class TestOvercloudDeploy(unittest.TestCase):
mock_virt_utils.virt_customize.assert_called()
mock_inject_odl.assert_called()
mock_inject_quagga.assert_called()
- mock_ovs_nsh.assert_called()
+ # mock_ovs_nsh.assert_called()
@patch('apex.builders.overcloud_builder.inject_ovs_nsh')
@patch('apex.builders.overcloud_builder.inject_opendaylight')
@@ -421,7 +421,7 @@ class TestOvercloudDeploy(unittest.TestCase):
prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test')
mock_virt_utils.virt_customize.assert_called()
mock_inject_odl.assert_called()
- mock_inject_ovs_nsh.assert_called()
+ # mock_inject_ovs_nsh.assert_called()
@patch('apex.overcloud.deploy.os.path.isfile')
def test_prep_image_no_image(self, mock_isfile):