From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 26 Aug 2013 13:25:38 +0000 (-0400)
Subject: remove --force in favor of --replacepkgs
X-Git-Tag: v1.2.3~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc0db6b76bb7e388c4272b42651e221c256613e1;p=ceph-deploy.git

remove --force in favor of --replacepkgs

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index 1b030ac..7629c6c 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -40,8 +40,6 @@ def install(distro, logger, version_kind, version):
             'rpm',
             '-Uvh',
             '--replacepkgs',
-            '--force',
-            '--quiet',
             '{url}noarch/ceph-release-1-0.el6.noarch.rpm'.format(url=url),
         ],
     )
@@ -79,7 +77,10 @@ def install_epel(distro, logger):
             pkg_managers.rpm(
                 distro.sudo_conn,
                 logger,
-                ['epel-release-6*.rpm'],
+                [
+                    '--replacepkgs',
+                    'epel-release-6*.rpm',
+                ],
                 stop_on_error=False,
             )
         else:
@@ -92,6 +93,9 @@ def install_epel(distro, logger):
             pkg_managers.rpm(
                 distro.sudo_conn,
                 logger,
-                ['epel-release-5*.rpm'],
+                [
+                    '--replacepkgs',
+                    'epel-release-5*.rpm'
+                ],
                 stop_on_error=False,
             )