Fixes incompatible python-docker package

[apex.git] / apex / builders / undercloud_builder.py

diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py
index ec75f3d..943c252 100644 (file)
--- a/apex/builders/undercloud_builder.py
+++ b/apex/builders/undercloud_builder.py
@@ -39,6 +39,8 @@ def add_upstream_packages(image):
         '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 +72,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)}