diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-25 15:27:44 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-25 15:27:44 -0400 |
| commit | 4d9668dac5fed8f713f3b4300fdb574f399c14ee (patch) | |
| tree | f2c2300dbf1a746a8581a4a1a7da1bf52f8dede9 | |
| parent | 3d10b8d080a874be022f9e25063ba77f0293c5e8 (diff) | |
| download | vyos-cloud-init-4d9668dac5fed8f713f3b4300fdb574f399c14ee.tar.gz vyos-cloud-init-4d9668dac5fed8f713f3b4300fdb574f399c14ee.zip | |
minor azure cleanup
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 30b06fef..d4863429 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -54,7 +54,7 @@ class DataSourceAzureNet(sources.DataSource): self.cfg = {} self.seed = None self.ds_cfg = util.mergemanydict([ - util.get_cfg_by_path(sys_cfg, DS_CFG_PATH), + util.get_cfg_by_path(sys_cfg, DS_CFG_PATH, {}), BUILTIN_DS_CONFIG]) def __str__(self): diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index c944cb13..4cd3f213 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -170,7 +170,6 @@ class TestAzureDataSource(MockerTestCase): 'dscfg': {'text': base64.b64encode(yaml.dump(cfg)), 'encoding': 'base64'}} data = {'ovfcontent': construct_valid_ovf_env(data=odata)} - print data dsrc = self._get_ds(data) ret = dsrc.get_data() |