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)
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,
'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,