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 /bin | |
| 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 'bin')
| -rwxr-xr-x | bin/cloud-init | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/cloud-init b/bin/cloud-init index 6c83c2e7..50bd929e 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -505,6 +505,8 @@ def status_wrapper(name, args, data_d=None, link_d=None): v1[mode]['errors'] = [str(e) for e in errors] except Exception as e: + util.logexc(LOG, "failed of stage %s", mode) + print_exc("failed run of stage %s", mode) v1[mode]['errors'] = [str(e)] v1[mode]['finished'] = time.time() |