diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-01-22 13:59:25 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-01-22 13:59:25 -0500 |
| commit | 3c0b9591b5203e60ac3cdda030b6eecbae27e938 (patch) | |
| tree | 425c24d82396c1f0b5ff82a1084a8601e687f18b /ec2init/__init__.py | |
| parent | 9645203e0c320a1623162124aa839f4163527d15 (diff) | |
| download | vyos-cloud-init-3c0b9591b5203e60ac3cdda030b6eecbae27e938.tar.gz vyos-cloud-init-3c0b9591b5203e60ac3cdda030b6eecbae27e938.zip | |
function ec2 metadata service removal. also fix issues with empty cloud-config
Diffstat (limited to 'ec2init/__init__.py')
| -rw-r--r-- | ec2init/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ec2init/__init__.py b/ec2init/__init__.py index 9d701619..80203c80 100644 --- a/ec2init/__init__.py +++ b/ec2init/__init__.py @@ -73,12 +73,15 @@ class EC2Init: stream.close() except: pass + + if conf is None: conf = { } # support reading the old ConfigObj format file and merging # it into the yaml dictionary try: from configobj import ConfigObj oldcfg = ConfigObj(self.old_conffile) + if oldcfg is None: oldcfg = { } conf = util.mergedict(conf,oldcfg) except: pass |