git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
openstack_observer
/
steps
/
sync_slivers.py
diff --git
a/planetstack/openstack_observer/steps/sync_slivers.py
b/planetstack/openstack_observer/steps/sync_slivers.py
index
8488b66
..
a2d0e81
100644
(file)
--- a/
planetstack/openstack_observer/steps/sync_slivers.py
+++ b/
planetstack/openstack_observer/steps/sync_slivers.py
@@
-93,7
+93,7
@@
class SyncSlivers(OpenStackSyncStep):
if (legacy):
host_filter = sliver.node.name.split('.',1)[0]
else:
if (legacy):
host_filter = sliver.node.name.split('.',1)[0]
else:
- host_filter = sliver.node.name
+ host_filter = sliver.node.name
.strip()
availability_zone_filter = 'nova:%s'%host_filter
sliver_name = '%s-%d'%(sliver.slice.name,sliver.id)
availability_zone_filter = 'nova:%s'%host_filter
sliver_name = '%s-%d'%(sliver.slice.name,sliver.id)
@@
-104,8
+104,8
@@
class SyncSlivers(OpenStackSyncStep):
controller = sliver.node.site_deployment.controller
tenant_fields = {'endpoint':controller.auth_url,
controller = sliver.node.site_deployment.controller
tenant_fields = {'endpoint':controller.auth_url,
- 'admin_user': sliver.creator.
username
,
- 'admin_password': sliver.creator.password,
+ 'admin_user': sliver.creator.
email
,
+ 'admin_password': sliver.creator.
remote_
password,
'admin_tenant': sliver.slice.name,
'tenant': sliver.slice.name,
'tenant_description': sliver.slice.description,
'admin_tenant': sliver.slice.name,
'tenant': sliver.slice.name,
'tenant_description': sliver.slice.description,
@@
-114,7
+114,7
@@
class SyncSlivers(OpenStackSyncStep):
'availability_zone': availability_zone_filter,
'image_id':image_id,
'key_name':keyname,
'availability_zone': availability_zone_filter,
'image_id':image_id,
'key_name':keyname,
- 'flavor_id':
3
,
+ 'flavor_id':
sliver.flavor.id
,
'nics':nics,
'meta':metadata_update,
'key':key_fields,
'nics':nics,
'meta':metadata_update,
'key':key_fields,