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/DataSourceCloudStack.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/DataSourceCloudStack.py')
| -rw-r--r-- | cloudinit/sources/DataSourceCloudStack.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py index 64595020..455a4652 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -89,8 +89,6 @@ class DataSourceCloudStack(sources.DataSource): def _get_url_settings(self): mcfg = self.ds_cfg - if not mcfg: - mcfg = {} max_wait = 120 try: max_wait = int(mcfg.get("max_wait", max_wait)) @@ -109,10 +107,6 @@ class DataSourceCloudStack(sources.DataSource): return (max_wait, timeout) def wait_for_metadata_service(self): - mcfg = self.ds_cfg - if not mcfg: - mcfg = {} - (max_wait, timeout) = self._get_url_settings() urls = [uhelp.combine_url(self.metadata_address, |