X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=apex%2Fbuilders%2Fundercloud_builder.py;h=47d2568dac1acc187bcd6baf7e69ba4502c481de;hb=e4b1cd108f74e2cd76caf6736632d597f7436a4e;hp=ec75f3dc68ddf1d0893b0e62c6e0f70fe7e8dd97;hpb=1fc27d26a7e2dab1fdd0718d2d8a3c751a6cb701;p=apex.git

diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py
index ec75f3dc..47d2568d 100644
--- a/apex/builders/undercloud_builder.py
+++ b/apex/builders/undercloud_builder.py
@@ -28,17 +28,17 @@ 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'
     ]
+    # Remove incompatible python-docker version
+    virt_ops.append({con.VIRT_RUN_CMD: "yum remove -y python-docker-py"})
 
     for pkg in pkgs:
         virt_ops.append({con.VIRT_INSTALL: pkg})
@@ -70,6 +70,7 @@ def update_repos(image, branch):
         {con.VIRT_RUN_CMD: "yum-config-manager --add-repo "
                            "https://trunk.rdoproject.org/centos7/{}"
                            "/delorean.repo".format(con.RDO_TAG)},
+        {con.VIRT_RUN_CMD: "yum clean all"},
         {con.VIRT_INSTALL: "python2-tripleo-repos"},
         {con.VIRT_RUN_CMD: "tripleo-repos -b {} {} ceph".format(branch,
                                                                 con.RDO_TAG)}