Merge branch 'geni-v3' of ssh://git.planet-lab.org/git/sfa into geni-v3

[sfa.git] / sfa / importer / openstackimporter.py

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index 62f29ef..0cf729c 100644 (file)
--- 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:
@@ -72,7 +73,7 @@ class OpenstackImporter:
                 else:
                     self.logger.warn("OpenstackImporter: person %s does not have a PL public key"%hrn)
                     pkey = Keypair(create=True)
-                user_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
+                user_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey, email=user.email)
                 user_record = RegUser ()
                 user_record.type='user'
                 user_record.hrn=hrn