From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Wed, 1 Oct 2014 15:23:37 +0000 (-0400)
Subject: do not detect sudo when attempting to copy ssh keys
X-Git-Tag: v1.5.17~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdc1740a32915471b9c79a4409d5aedf6d6913f6;p=ceph-deploy.git

do not detect sudo when attempting to copy ssh keys

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

diff --git a/ceph_deploy/new.py b/ceph_deploy/new.py
index d87c3ec..87c6886 100644
--- a/ceph_deploy/new.py
+++ b/ceph_deploy/new.py
@@ -58,7 +58,7 @@ def ssh_copy_keys(hostname, username=None):
 
     # Get the contents of id_rsa.pub and push it to the host
     LOG.info('will connect again with password prompt')
-    distro = hosts.get(hostname, username)  # XXX Add username
+    distro = hosts.get(hostname, username, detect_sudo=False)
     auth_keys_path = '.ssh/authorized_keys'
     if not distro.conn.remote_module.path_exists(auth_keys_path):
         distro.conn.logger.warning(