From: Alfredo Deza <alfredo@deza.pe>
Date: Mon, 29 Jul 2013 19:59:25 +0000 (-0400)
Subject: fedora adapated to work with the new wrappers
X-Git-Tag: v1.2~16^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc7d46f039fd3462784d5d4616caef3a8ace7c11;p=ceph-deploy.git

fedora adapated to work with the new wrappers

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

diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py
index 099454c..8182036 100644
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@ -1,15 +1,19 @@
+from ceph_deploy.util.wrappers import check_call
+from ceph_deploy.util.context import remote
 
 
-def install(release, codename, version_kind, version):
-    import platform
-    import subprocess
+def install(distro, logger, release, version_kind, version):
+    release = distro.release
+    machine = distro.sudo_conn.modules.platform.machine()
 
     if version_kind in ['stable', 'testing']:
         key = 'release'
     else:
         key = 'autobuild'
 
-    subprocess.check_call(
+    check_call(
+        distro.sudo_conn,
+        logger,
         args='su -c \'rpm --import "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/{key}.asc"\''.format(key=key),
         shell=True,
         )
@@ -26,11 +30,13 @@ def install(release, codename, version_kind, version):
     elif version_kind == 'dev':
         url = 'http://gitbuilder.ceph.com/ceph-rpm-fc{release}-{machine}-basic/ref/{version}/'.format(
             release=release.split(".", 1)[0],
-            machine=platform.machine(),
+            machine=machine,
             version=version,
             )
 
-    subprocess.check_call(
+    check_call(
+        distro.sudo_conn,
+        logger,
         args=[
             'rpm',
             '-Uvh',
@@ -44,7 +50,9 @@ def install(release, codename, version_kind, version):
             ]
         )
 
-    subprocess.check_call(
+    check_call(
+        distro.sudo_conn,
+        logger,
         args=[
             'yum',
             '-y',