From 5f1d95372bfaf8302ef9a9058d4c79e184716b0a Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 15 Mar 2012 23:56:04 -0400 Subject: [PATCH] assume first user's first key is the project key --- sfa/openstack/nova_driver.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 5613a020..c9385f98 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -292,11 +292,20 @@ class NovaDriver (Driver): pubkeys = [] for user in users: pubkeys.extend(user['keys']) - # assume that there is a key whos nane matches the caller's username. - project_key = Xrn(users[0]['urn']).get_leaf() - + # ensure slice record exists aggregate.create_project(slicename, users, options=options) + + # use the first keypair we find + project_key = None + for user in users: + username = Xrn(user['urn']).get_leaf() + user_keys = self.shell.db.key_pair_get_all_by_user(username) + if user_keys: + #project_key = user_keys[0].id + project_key = user_keys[0].name + + # ensure person records exists aggregate.run_instances(slicename, rspec_string, project_key, pubkeys) -- 2.43.0