x/cloud-init
Code Issues Proposed changes

Configobj should be a requirement now, and not optional,

Browse Source 
so there is no need to check the import for errors.
This commit is contained in:
harlowja 2012-06-22 08:50:19 -07:00
parent 8891256526
commit 332cd4c126
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloudinit/config/cc_landscape.py
View File

@ -22,10 +22,7 @@ import os
from StringIO import StringIO from StringIO import StringIO
try: from configobj import ConfigObj
from configobj import ConfigObj
except ImportError:
ConfigObj = None
from cloudinit import util from cloudinit import util
@ -48,16 +45,12 @@ LSC_BUILTIN_CFG = {
} }
def handle(name, cfg, cloud, log, _args): def handle(_name, cfg, cloud, log, _args):
""" """
Basically turn a top level 'landscape' entry with a 'client' dict Basically turn a top level 'landscape' entry with a 'client' dict
and render it to ConfigObj format under '[client]' section in and render it to ConfigObj format under '[client]' section in
/etc/landscape/client.conf /etc/landscape/client.conf
""" """
if not ConfigObj:
log.warn(("'ConfigObj' support not available,"
" running module %s disabled"), name)
return
ls_cloudcfg = cfg.get("landscape", {}) ls_cloudcfg = cfg.get("landscape", {})