openstack
/
manila
Code Issues Proposed changes

Merge "Fixes bug with path to ssh keys"

This commit is contained in:
Jenkins 2014-02-20 10:29:31 +00:00 committed by Gerrit Code Review
parent 63268451aa e416fc97ff
commit 25d52a2303
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manila/share/drivers/generic.py
View File

@ -457,8 +457,12 @@ class GenericShareDriver(driver.ExecuteMixin, driver.ShareDriver):
if not self.configuration.path_to_public_key or \
not self.configuration.path_to_private_key:
return
if not os.path.exists(self.configuration.path_to_public_key) or \
not os.path.exists(self.configuration.path_to_private_key):
path_to_public_key = \
os.path.expanduser(self.configuration.path_to_public_key)
path_to_private_key = \
os.path.expanduser(self.configuration.path_to_private_key)
if not os.path.exists(path_to_public_key) or \
not os.path.exists(path_to_private_key):
return
keypair_name = self.configuration.manila_service_keypair_name
keypairs = [k for k in self.compute_api.keypair_list(context)
@ -467,7 +471,7 @@ class GenericShareDriver(driver.ExecuteMixin, driver.ShareDriver):
raise exception.ManilaException(_('Ambiguous keypairs'))
public_key, _ = self._execute('cat',
self.configuration.path_to_public_key,
path_to_public_key,
run_as_root=True)
if not keypairs:
keypair = self.compute_api.keypair_import(context, keypair_name,