From: Tony Mack Date: Thu, 5 Jul 2012 13:25:05 +0000 (-0400) Subject: updates X-Git-Tag: sfa-2.1-12~8 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4fa19b3f280fc626543d4edfc24fae2ac3337419;p=sfa.git updates --- diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py index 62f29efc..1f2af928 100644 --- a/sfa/importer/openstackimporter.py +++ b/sfa/importer/openstackimporter.py @@ -54,7 +54,8 @@ class OpenstackImporter: hrn = OSXrn(name=user.name, auth=auth_hrn, type='user').get_hrn() users_dict[hrn] = user old_keys = old_user_keys.get(hrn, []) - keys = [k.public_key for k in self.shell.nova_manager.keypairs.findall(name=hrn)] + keyname = OSXrn(xrn=hrn, type='user').get_slicename() + keys = [k.public_key for k in self.shell.nova_manager.keypairs.findall(name=keyname)] user_keys[hrn] = keys update_record = False if old_keys != keys: diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 98a67239..f8aa84e8 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -118,7 +118,8 @@ class NovaDriver(Driver): self.shell.auth_manager.roles.add_user_role(user, slice_tenant, 'user') keys = sfa_records.get('keys', []) for key in keys: - self.shell.nova_client.keypairs.create(name, key) + keyname = OSXrn(xrn=hrn, type='user').get_slicename() + self.shell.nova_client.keypairs.create(keyname, key) return user def register_authority(self, sfa_record, hrn):