Modify image sync in novaproxy to for juno
modify the filesystem in image/sync/drivers for juno reason. Change-Id: Ie146da171af52af195a56a8abcee5622c3ce3d8c
This commit is contained in:
parent
5ff55866f8
commit
b6461fcb82
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user