From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Thu, 12 Sep 2013 18:56:40 +0000 (-0400)
Subject: make all distros use the new get_connection helper
X-Git-Tag: v1.2.4~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f50cbd699d5e33d91f75dd1dc45ea47572fa5045;p=ceph-deploy.git

make all distros use the new get_connection helper

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

diff --git a/ceph_deploy/hosts/centos/mon/create.py b/ceph_deploy/hosts/centos/mon/create.py
index a0b7bdb..8a83a92 100644
--- a/ceph_deploy/hosts/centos/mon/create.py
+++ b/ceph_deploy/hosts/centos/mon/create.py
@@ -1,6 +1,7 @@
 from ceph_deploy.hosts import common
 from ceph_deploy.misc import remote_shortname
-from ceph_deploy.lib.remoto import Connection, process
+from ceph_deploy.lib.remoto import process
+from ceph_deploy.connection import get_connection
 
 
 def create(distro, logger, args, monitor_keyring):
@@ -9,7 +10,7 @@ def create(distro, logger, args, monitor_keyring):
     service = common.which_service(distro.sudo_conn, logger)
 
     # TODO transition this once pushy is out
-    rconn = Connection(hostname, logger, sudo=True)
+    rconn = get_connection(hostname, logger)
     process.run(
         rconn,
         [
diff --git a/ceph_deploy/hosts/debian/mon/create.py b/ceph_deploy/hosts/debian/mon/create.py
index 40f6e8d..a037fc0 100644
--- a/ceph_deploy/hosts/debian/mon/create.py
+++ b/ceph_deploy/hosts/debian/mon/create.py
@@ -1,6 +1,7 @@
 from ceph_deploy.hosts import common
 from ceph_deploy.misc import remote_shortname
-from ceph_deploy.lib.remoto import Connection, process
+from ceph_deploy.lib.remoto import process
+from ceph_deploy.connection import get_connection
 
 
 def create(distro, logger, args, monitor_keyring):
@@ -8,7 +9,7 @@ def create(distro, logger, args, monitor_keyring):
     common.mon_create(distro, logger, args, monitor_keyring, hostname)
 
     # TODO transition this once pushy is out
-    rconn = Connection(hostname, logger, sudo=True)
+    rconn = get_connection(hostname, logger)
 
     if distro.init == 'upstart':  # Ubuntu uses upstart
         process.run(
diff --git a/ceph_deploy/hosts/fedora/mon/create.py b/ceph_deploy/hosts/fedora/mon/create.py
index e8fa199..ac1c0fe 100644
--- a/ceph_deploy/hosts/fedora/mon/create.py
+++ b/ceph_deploy/hosts/fedora/mon/create.py
@@ -1,6 +1,7 @@
 from ceph_deploy.hosts import common
 from ceph_deploy.misc import remote_shortname
-from ceph_deploy.lib.remoto import Connection, process
+from ceph_deploy.lib.remoto import process
+from ceph_deploy.connection import get_connection
 
 
 def create(distro, logger, args, monitor_keyring):
@@ -9,7 +10,7 @@ def create(distro, logger, args, monitor_keyring):
     service = common.which_service(distro.sudo_conn, logger)
 
     # TODO transition this once pushy is out
-    rconn = Connection(hostname, logger, sudo=True)
+    rconn = get_connection(hostname, logger)
 
     process.run(
         rconn,
diff --git a/ceph_deploy/hosts/suse/mon/create.py b/ceph_deploy/hosts/suse/mon/create.py
index e8fa199..ac1c0fe 100644
--- a/ceph_deploy/hosts/suse/mon/create.py
+++ b/ceph_deploy/hosts/suse/mon/create.py
@@ -1,6 +1,7 @@
 from ceph_deploy.hosts import common
 from ceph_deploy.misc import remote_shortname
-from ceph_deploy.lib.remoto import Connection, process
+from ceph_deploy.lib.remoto import process
+from ceph_deploy.connection import get_connection
 
 
 def create(distro, logger, args, monitor_keyring):
@@ -9,7 +10,7 @@ def create(distro, logger, args, monitor_keyring):
     service = common.which_service(distro.sudo_conn, logger)
 
     # TODO transition this once pushy is out
-    rconn = Connection(hostname, logger, sudo=True)
+    rconn = get_connection(hostname, logger)
 
     process.run(
         rconn,