From db0a110b779b68f11d311fef5e2f6e359ef328a4 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 8 Aug 2014 09:57:28 -0700 Subject: [PATCH] set default userdata --- planetstack/openstack_observer/steps/sync_slivers.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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() -- 2.47.0