diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
| commit | 5994f3bc480c918d8756ab0cb8ecfa34975eb307 (patch) | |
| tree | 893c47ee8e3523982081f600bf770ffd68a54ac7 /cloudinit/sources/DataSourceEc2.py | |
| parent | 1355ce5e2b53b063cde2825b6df9de1cdd2b1797 (diff) | |
| parent | d75a912fb375afbab055db3178966d1f83b44143 (diff) | |
| download | vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.tar.gz vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.zip | |
merge trunk at 0.7.7~bzr1200
Diffstat (limited to 'cloudinit/sources/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 3ef2c6af..6fe2a0bb 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -84,8 +84,6 @@ class DataSourceEc2(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)) @@ -102,8 +100,6 @@ class DataSourceEc2(sources.DataSource): def wait_for_metadata_service(self): mcfg = self.ds_cfg - if not mcfg: - mcfg = {} (max_wait, timeout) = self._get_url_settings() if max_wait <= 0: |