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>

diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py
index 943c252..47d2568 100644 (file)
--- a/apex/builders/undercloud_builder.py
+++ b/apex/builders/undercloud_builder.py
@@ -28,14 +28,12 @@ def add_upstream_packages(image):
     pkgs = [
         'epel-release',
         'openstack-utils',
-        'ceph-common',
         'python2-networking-sfc',
         'openstack-ironic-inspector',
         'subunit-filters',
         'docker-distribution',
         'openstack-tripleo-validations',
         'libguestfs-tools',
-        'ceph-ansible',
         'python-tripleoclient',
         'openstack-tripleo-heat-templates'
     ]

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 2726374..538f50a 100644 (file)
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -367,11 +367,12 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
         pw_op = "password:{}".format(root_pw)
         virt_cmds.append({con.VIRT_PW: pw_op})
 
-    if dataplane == 'ovs':
+    # FIXME(trozet) ovs build is failing in CentOS 7.6
+    # if dataplane == 'ovs':
         # FIXME(trozet) remove this after RDO is updated with fix for
         # https://bugzilla.redhat.com/show_bug.cgi?id=1544892
         # https://review.rdoproject.org/r/#/c/13839/
-        oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir)
+        # oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir)
 
     if dataplane == 'fdio':
         # Patch neutron with using OVS external interface for router

diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index d4d9083..79dbf54 100644 (file)
--- 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):

diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index 545d32a..07b82c8 100644 (file)
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -73,6 +73,10 @@
             src: /home/stack/apex-undercloud-install.log
             dest: "{{ apex_temp_dir }}/"
             flat: yes
+    - name: Install ceph-ansible
+      yum:
+        name: ceph-ansible
+      become: yes
     - name: openstack-configs nova
       shell: openstack-config --set /var/lib/config-data/nova/etc/nova/nova.conf DEFAULT {{ item }}
       become: yes