diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-02-26 14:10:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-02-26 14:10:17 -0500 |
| commit | c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad (patch) | |
| tree | 6f36dc496da710a02562f52d05c676b2c8479377 /cloudinit/user_data.py | |
| parent | e2fea567772f3d178072607aee617c3792185db0 (diff) | |
| parent | 0ebca9c158c87b28fb61974e9e36e645cf60494c (diff) | |
| download | vyos-cloud-init-c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad.tar.gz vyos-cloud-init-c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad.zip | |
readurl, read_file_or_url returns bytes, user must convert as necessary
* explicitly test compressed user-data.
* userdata_raw is now bytes
* add load_tfile_or_url for loading text file or url
* ec2_utils: all meta-data is text, remove non-obvious string translations
* DigitalOcean: adjust for ec2_utils
* DataSourceGCE, DataSourceMAAS: user-data is binary other fields are text.
* openstack.py: read paths without decoding to text. This is ok as paths
other than user-data are json, and load_json will handle
* load_file still returns text, and that is what most things use.
LP: #1424900
Diffstat (limited to 'cloudinit/user_data.py')
| -rw-r--r-- | cloudinit/user_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py index b11894ce..663a9048 100644 --- a/cloudinit/user_data.py +++ b/cloudinit/user_data.py @@ -237,9 +237,9 @@ class UserDataProcessor(object): resp = util.read_file_or_url(include_url, ssl_details=self.ssl_details) if include_once_on and resp.ok(): - util.write_file(include_once_fn, resp, mode=0o600) + util.write_file(include_once_fn, resp.contents, mode=0o600) if resp.ok(): - content = str(resp) + content = resp.contents else: LOG.warn(("Fetching from %s resulted in" " a invalid http code of %s"), |