diff options
| -rw-r--r-- | cloudinit/ec2_utils.py | 1 | ||||
| -rw-r--r-- | cloudinit/stages.py | 3 | ||||
| -rw-r--r-- | tests/unittests/test_data.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py index 7cf99186..37b92a83 100644 --- a/cloudinit/ec2_utils.py +++ b/cloudinit/ec2_utils.py @@ -185,6 +185,7 @@ def get_instance_metadata(api_version='latest', caller = functools.partial(util.read_file_or_url, ssl_details=ssl_details, timeout=timeout, retries=retries) + def mcaller(url): return caller(url).contents diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 94fcf4cc..45d64823 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -346,7 +346,8 @@ class Init(object): processed_vd = str(self.datasource.get_vendordata()) if processed_vd is None: processed_vd = '' - util.write_file(self._get_ipath('vendordata'), str(processed_vd), 0o600) + util.write_file(self._get_ipath('vendordata'), str(processed_vd), + 0o600) def _default_handlers(self, opts=None): if opts is None: diff --git a/tests/unittests/test_data.py b/tests/unittests/test_data.py index 48475515..8fc280e4 100644 --- a/tests/unittests/test_data.py +++ b/tests/unittests/test_data.py @@ -58,7 +58,6 @@ def gzip_text(text): return contents.getvalue() - # FIXME: these tests shouldn't be checking log output?? # Weirddddd... class TestConsumeUserData(helpers.FilesystemMockingTestCase): |