git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d8854c
)
preserve node client id from request rspec
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 29 Aug 2012 22:01:49 +0000
(18:01 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 29 Aug 2012 22:01:49 +0000
(18:01 -0400)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
7696fee
..
80d82da
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-109,6
+109,9
@@
class OSAggregate:
node_dict[node_xrn.urn] = rspec_node
else:
rspec_node = node_dict[node_xrn.urn]
node_dict[node_xrn.urn] = rspec_node
else:
rspec_node = node_dict[node_xrn.urn]
+
+ if instance.metadata.get('client_id'):
+ rspec_node['client_id'] = instance.metadata.get('client_id')
flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id'])
sliver = instance_to_sliver(flavor)
flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id'])
sliver = instance_to_sliver(flavor)
@@
-280,6
+283,8
@@
class OSAggregate:
metadata['security_groups'] = group_name
if node.get('component_id'):
metadata['component_id'] = node['component_id']
metadata['security_groups'] = group_name
if node.get('component_id'):
metadata['component_id'] = node['component_id']
+ if node.get('client_id'):
+ metadata['client_id'] = node['client_id']
self.driver.shell.nova_manager.servers.create(flavor=flavor_id,
image=image_id,
key_name = key_name,
self.driver.shell.nova_manager.servers.create(flavor=flavor_id,
image=image_id,
key_name = key_name,