x/cloud-init
Code Issues Proposed changes

Remove support for older ec2 configobj merging.

Browse Source
This commit is contained in:
Joshua Harlow 2012-06-22 12:36:01 -07:00
parent 5b2d8db914
commit c53a8553b1
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloudinit/stages.py
View File

@ -26,9 +26,6 @@ import copy
import os import os
import sys import sys
from configobj import ConfigObj
from cloudinit.settings import (OLD_CLOUD_CONFIG)
from cloudinit.settings import (PER_INSTANCE, FREQUENCIES) from cloudinit.settings import (PER_INSTANCE, FREQUENCIES)
from cloudinit import handlers from cloudinit import handlers
@ -64,11 +61,6 @@ class Init(object):
# Created only when a fetch occurs # Created only when a fetch occurs
self.datasource = None self.datasource = None
def _read_cfg_old(self):
# Support reading the old ConfigObj format file
old_cfg = ConfigObj(OLD_CLOUD_CONFIG)
return dict(old_cfg)
@property @property
def distro(self): def distro(self):
if not self._distro: if not self._distro:
@ -165,13 +157,12 @@ class Init(object):
except: except:
util.logexc(LOG, ("Failed loading of additional" util.logexc(LOG, ("Failed loading of additional"
" configuration from %s"), fn) " configuration from %s"), fn)
# Now read in the built-in + base + old # Now read in the built-in + base
try: try:
conf = util.get_base_cfg(builtin=util.get_builtin_cfg()) conf = util.get_base_cfg(builtin=util.get_builtin_cfg())
except Exception: except Exception:
conf = util.get_builtin_cfg() conf = util.get_builtin_cfg()
i_cfgs.append(conf) i_cfgs.append(conf)
i_cfgs.append(self._read_cfg_old())
return util.mergemanydict(i_cfgs) return util.mergemanydict(i_cfgs)
def _restore_from_cache(self): def _restore_from_cache(self):