]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
remove --force in favor of --replacepkgs 50/head
authorAlfredo Deza <alfredo.deza@inktank.com>
Mon, 26 Aug 2013 13:25:38 +0000 (09:25 -0400)
committerAlfredo Deza <alfredo.deza@inktank.com>
Mon, 26 Aug 2013 20:39:08 +0000 (16:39 -0400)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
ceph_deploy/hosts/centos/install.py

index 1b030ac1a2b0f96c8c7d1ddfd383306bed95a72e..7629c6c82d7d3f9f557b8148f6fe1e2bac67259f 100644 (file)
@@ -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,
             )