X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_slivers.py;h=8155c10300f7253da13293472616d0c11074a6d4;hb=ac5578b11e845c752b83f44371c8e1dd58f7e22b;hp=09c1c04d8c45c531e8566a6369d28d9ba6c71791;hpb=8ba47172105102823286e30f50cb62a395247e2d;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py index 09c1c04..8155c10 100644 --- a/planetstack/openstack_observer/steps/sync_slivers.py +++ b/planetstack/openstack_observer/steps/sync_slivers.py @@ -105,7 +105,7 @@ class SyncSlivers(OpenStackSyncStep): controller = sliver.node.site_deployment.controller tenant_fields = {'endpoint':controller.auth_url, 'admin_user': sliver.creator.email, - 'admin_password': sliver.creator.reomote_password, + 'admin_password': sliver.creator.remote_password, '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, - 'flavor_id':3, + 'flavor_id':sliver.flavor.id, 'nics':nics, 'meta':metadata_update, 'key':key_fields, @@ -124,9 +124,18 @@ class SyncSlivers(OpenStackSyncStep): if (len(res)!=2): raise Exception('Could not sync sliver %s'%sliver.slice.name) else: - sliver_id = res[1]['id'] # 0 is for the key + sliver_id = res[1]['info']['OS-EXT-SRV-ATTR:instance_name'] # 0 is for the key + sliver_uuid = res[1]['id'] # 0 is for the key + + try: + hostname = res[1]['info']['OS-EXT-SRV-ATTR:hypervisor_hostname'] + ip = socket.gethostbyname(hostname) + sliver.ip = ip + except: + pass sliver.instance_id = sliver_id + sliver.instance_uuid = sliver_uuid sliver.instance_name = sliver_name sliver.save()