From: Wanlong Gao <wanlong.gao@easystack.cn>
Date: Tue, 14 Jun 2016 10:41:56 +0000 (+0800)
Subject: Fix rsync username when using local_mirror
X-Git-Tag: v1.5.35~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17b9bcc776ff9f196dcf7ad3044bc07864e6adb8;p=ceph-deploy.git

Fix rsync username when using local_mirror

We should use the configured username for rsync to connect
to the remote host.

Signed-off-by: Wanlong Gao <wanlong.gao@easystack.cn>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 4449de3..bd4df20 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -147,6 +147,8 @@ def install(args):
             gpg_url = gpg_fallback
 
         if args.local_mirror:
+            if args.username:
+                hostname = "%s@%s" % (args.username, hostname)
             remoto.rsync(hostname, args.local_mirror, '/opt/ceph-deploy/repo', distro.conn.logger, sudo=True)
             repo_url = 'file:///opt/ceph-deploy/repo'
             gpg_url = 'file:///opt/ceph-deploy/repo/release.asc'