diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-04 12:31:28 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-04 12:31:28 -0400 |
| commit | 3b69f410718f7d8868b8cbaa04e3969811ee89a9 (patch) | |
| tree | 4a1ab11d76fa9cde63214234cfa3eeefea542238 /cloudinit/sources/__init__.py | |
| parent | 098241594ff83a2e2070a2e9b4581301e19a76f9 (diff) | |
| download | vyos-cloud-init-3b69f410718f7d8868b8cbaa04e3969811ee89a9.tar.gz vyos-cloud-init-3b69f410718f7d8868b8cbaa04e3969811ee89a9.zip | |
DataSource: set ds_cfg to be a dictionary
if the Datasource does not have an entry in config, then
set it to be a empty dictionary rather than None.
Also remove places that did this elsewhere.
Diffstat (limited to 'cloudinit/sources/__init__.py')
| -rw-r--r-- | cloudinit/sources/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 82cd3553..6bf2c33b 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -70,6 +70,9 @@ class DataSource(object): self.ds_cfg = util.get_cfg_by_path(self.sys_cfg, ("datasource", name), {}) + if not self.ds_cfg: + self.ds_cfg = {} + if not ud_proc: self.ud_proc = ud.UserDataProcessor(self.paths) else: |