From: Vasu Kulkarni <vasu@redhat.com>
Date: Fri, 28 Jul 2017 17:55:13 +0000 (-0700)
Subject: [RM-20809] handle package conflicts when upgrading/reinstalling
X-Git-Tag: v1.5.39~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F448%2Fhead;p=ceph-deploy.git

[RM-20809] handle package conflicts when upgrading/reinstalling

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index 49e9f8a..d622635 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -78,12 +78,22 @@ def install(distro, version_kind, version, adjust_repos, **kw):
             elif version_kind == 'testing':
                 url = 'https://download.ceph.com/rpm-testing/{repo}/'.format(repo=repo_part)
 
+            # remove any old ceph-release package from prevoius release
             remoto.process.run(
                 distro.conn,
                 [
-                    'rpm',
-                    '-Uvh',
-                    '--replacepkgs',
+                    'yum',
+                    'remove',
+                    '-y',
+                    'ceph-release'
+                ],
+            )
+            remoto.process.run(
+                distro.conn,
+                [
+                    'yum',
+                    'install',
+                    '-y',
                     '{url}noarch/ceph-release-1-0.{dist}.noarch.rpm'.format(url=url, dist=dist),
                 ],
             )