From b6461fcb82907c599b382023376369dfe59f840b Mon Sep 17 00:00:00 2001 From: joey5678 Date: Mon, 24 Nov 2014 15:11:25 +0800 Subject: [PATCH] Modify image sync in novaproxy to for juno modify the filesystem in image/sync/drivers for juno reason. Change-Id: Ie146da171af52af195a56a8abcee5622c3ce3d8c --- novaproxy/nova/image/sync/drivers/filesystem.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/novaproxy/nova/image/sync/drivers/filesystem.py b/novaproxy/nova/image/sync/drivers/filesystem.py index 13cf276a..6063d4a1 100644 --- a/novaproxy/nova/image/sync/drivers/filesystem.py +++ b/novaproxy/nova/image/sync/drivers/filesystem.py @@ -59,10 +59,7 @@ class Store(object): from_store_loc['login_password']) except Exception: LOG.exception("ssh login failed.") -<<<<<<< HEAD raise -======= ->>>>>>> 9458b6b... Transplant tricircle to Juno from_ssh.sendline('ls %s' % copy_path) from_ssh.prompt() @@ -78,10 +75,7 @@ class Store(object): msg = _("the image path for copy to is not exists, file copy" "failed: path is %s" % (copy_path)) LOG.exception(msg) -<<<<<<< HEAD raise -======= ->>>>>>> 9458b6b... Transplant tricircle to Juno from_ssh.sendline('scp -P 22 %s %s' % (copy_path, to_path)) while True: @@ -98,10 +92,7 @@ class Store(object): msg = _("scp commond execute failed, with copy_path %s and " "to_path %s" % (copy_path, to_path)) LOG.exception(msg) -<<<<<<< HEAD raise -======= ->>>>>>> 9458b6b... Transplant tricircle to Juno break if from_ssh: