X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_slivers.py;h=299b02fbd7c0e60e0df62cc7b366b71bab3f4e02;hb=79684afcfec1bc37e7229f67945a34b470b89476;hp=249b938933c2abbbba2e5a098cd36a2b3c23ba37;hpb=9650004cea2667f8f9f458f4aecb834b31ead06a;p=plstackapi.git

diff --git a/planetstack/openstack_observer/steps/sync_slivers.py b/planetstack/openstack_observer/steps/sync_slivers.py
index 249b938..299b02f 100644
--- a/planetstack/openstack_observer/steps/sync_slivers.py
+++ b/planetstack/openstack_observer/steps/sync_slivers.py
@@ -14,6 +14,10 @@ class SyncSlivers(OpenStackSyncStep):
     provides=[Sliver]
     requested_interval=0
 
+    def get_userdata(self, sliver):
+        userdata = 'opencloud:\n   slicename: "%s"\n   hostname: "%s"\n' % (sliver.slice.name, sliver.node.name)
+        return userdata
+
     def sync_record(self, sliver):
         logger.info("sync'ing sliver:%s deployment:%s " % (sliver, sliver.node.deployment))
         metadata_update = {}
@@ -72,13 +76,17 @@ class SyncSlivers(OpenStackSyncStep):
                                'public_key': sliver.creator.public_key}
                 driver.create_keypair(**key_fields)
 
+            userData = self.get_userdata(sliver)
+            if sliver.userData:
+                userData = sliver.userData
+
             instance = driver.spawn_instance(name=sliver.name,
                                 key_name = keyname,
                                 image_id = image_id,
                                 hostname = sliver.node.name,
                                 pubkeys = pubkeys,
                                 nics = nics,
-                                userdata = sliver.userData )
+                                userdata = userData )
             sliver.instance_id = instance.id
             sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name')
             sliver.save()