From: Zack Cerza <zack@redhat.com>
Date: Mon, 9 Oct 2017 21:14:40 +0000 (-0600)
Subject: downburst: Explicitly type our user-data
X-Git-Tag: 1.1.0~385^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1119%2Fhead;p=teuthology.git

downburst: Explicitly type our user-data

Something broke for us in cloud-init 0.7.9. Turns out our user-data was
being interpreted as an octet-stream, as opposed to a cloud-config. Mark
it as a cloud-config, so that cloud-init will do the right thing once
more.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/provision/downburst.py b/teuthology/provision/downburst.py
index fdb23af43..62f29e352 100644
--- a/teuthology/provision/downburst.py
+++ b/teuthology/provision/downburst.py
@@ -209,7 +209,8 @@ class Downburst(object):
         if os_type in ('ubuntu', 'fedora'):
             user_info['packages'].append('python')
         user_fd = tempfile.NamedTemporaryFile(delete=False)
-        yaml.safe_dump(user_info, user_fd)
+        user_str = "#cloud-config\n" + yaml.safe_dump(user_info)
+        user_fd.write(user_str)
         self.user_path = user_fd.name
         return True