commit 03d25608223aac210cef990f0fd0649403783a9e
author Andy Bavier <acb@cs.princeton.edu> Thu Apr 16 13:41:50 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Thu Apr 16 13:41:50 2015 -0400
tree fa84acd29433a96a263c19ae1bab998d7efba1b6
parent 16f973610f338e1e312163b34f4121a1263520e1

Fix problems with generated user data

xos/openstack_observer/steps/sync_slivers.py

diff --git a/xos/openstack_observer/steps/sync_slivers.py b/xos/openstack_observer/steps/sync_slivers.py
index 1774e69..a1ea203 100644
--- a/xos/openstack_observer/steps/sync_slivers.py
+++ b/xos/openstack_observer/steps/sync_slivers.py
@@ -21,8 +21,8 @@
     observes=Sliver
 
     def get_userdata(self, sliver, pubkeys):
-        userdata = 'opencloud:\n   slicename: "%s"\n   hostname: "%s"\n   restapi_hostname: "%s"\n   restapi_port: "%s"\n' % (sliver.slice.name, sliver.node.name, RESTAPI_HOSTNAME, str(RESTAPI_PORT))
-        userdata += 'ssh-authorized-keys:\n'
+        userdata = '#cloud-config\n\nopencloud:\n   slicename: "%s"\n   hostname: "%s"\n   restapi_hostname: "%s"\n   restapi_port: "%s"\n' % (sliver.slice.name, sliver.node.name, RESTAPI_HOSTNAME, str(RESTAPI_PORT))
+        userdata += 'ssh_authorized_keys:\n'
         for key in pubkeys:
             userdata += '  - %s\n' % key
         return userdata