diff options
| -rw-r--r-- | apex/builders/undercloud_builder.py | 2 | ||||
| -rw-r--r-- | apex/common/constants.py | 2 | ||||
| -rw-r--r-- | apex/overcloud/deploy.py | 5 | ||||
| -rw-r--r-- | apex/tests/config/98faaca.diff | 2 | ||||
| -rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 8 | ||||
| -rw-r--r-- | build/patches/neutron-patch-NSDriver.patch | 2 | ||||
| -rw-r--r-- | lib/ansible/playbooks/configure_undercloud.yml | 4 |
7 files changed, 14 insertions, 11 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index 943c2525..47d2568d 100644 --- 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/common/constants.py b/apex/common/constants.py index 4e48920e..59988f74 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -53,7 +53,7 @@ DEPLOY_TIMEOUT = 120 RDO_TAG = 'current-tripleo' UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format( RDO_TAG) -OPENSTACK_GERRIT = 'https://review.openstack.org' +OPENSTACK_GERRIT = 'https://review.opendev.org' DOCKER_TAG = RDO_TAG # Maps regular service files to docker versions diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 27263740..538f50a4 100644 --- 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/config/98faaca.diff b/apex/tests/config/98faaca.diff index 68a66fbc..96462d5f 100644 --- a/apex/tests/config/98faaca.diff +++ b/apex/tests/config/98faaca.diff @@ -17,7 +17,7 @@ specified in environments/services-docker/update-odl.yaml. Upgrading ODL to the next major release (1.1->2) requires only the L2 steps. These are implemented as upgrade_tasks and -post_upgrade_tasks in https://review.openstack.org/489201. +post_upgrade_tasks in https://review.opendev.org/489201. Steps involved in level 2 update are 1. Block OVS instances to connect to ODL diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index d4d90835..79dbf54b 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): diff --git a/build/patches/neutron-patch-NSDriver.patch b/build/patches/neutron-patch-NSDriver.patch index 84b4fb02..95ad58f9 100644 --- a/build/patches/neutron-patch-NSDriver.patch +++ b/build/patches/neutron-patch-NSDriver.patch @@ -139,7 +139,7 @@ index 88d6e67f31..c0fab604d1 100644 + + def _configure_mtu(self, ns_dev, mtu=None): + # Need to set MTU, after added to namespace. See review -+ # https://review.openstack.org/327651 ++ # https://review.opendev.org/327651 + try: + # Note: network_device_mtu will be deprecated in future + mtu_override = self.conf.network_device_mtu diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml index 545d32ad..07b82c8e 100644 --- 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 |