diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-09-05 13:11:09 +0200 | 
|---|---|---|
| committer | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-09-05 13:11:09 +0200 | 
| commit | 744c779182cba32314f8435660a61c2711cb9f54 (patch) | |
| tree | 7871342bf0b122217b51493286bac982313b48da /cloudinit/config/cc_landscape.py | |
| parent | 8a2a88e0bb4520eabe99b6686413a548f3d59652 (diff) | |
| parent | 1d27cd75eaaeef7b72f3be77de24da815c82a825 (diff) | |
| download | vyos-cloud-init-744c779182cba32314f8435660a61c2711cb9f54.tar.gz vyos-cloud-init-744c779182cba32314f8435660a61c2711cb9f54.zip  | |
Merged trunk lp:cloud-init
Diffstat (limited to 'cloudinit/config/cc_landscape.py')
| -rw-r--r-- | cloudinit/config/cc_landscape.py | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py index 2efdff79..8a709677 100644 --- a/cloudinit/config/cc_landscape.py +++ b/cloudinit/config/cc_landscape.py @@ -24,6 +24,7 @@ from StringIO import StringIO  from configobj import ConfigObj +from cloudinit import type_utils  from cloudinit import util  from cloudinit.settings import PER_INSTANCE @@ -58,7 +59,8 @@ def handle(_name, cfg, cloud, log, _args):      if not isinstance(ls_cloudcfg, (dict)):          raise RuntimeError(("'landscape' key existed in config,"                              " but not a dictionary type," -                            " is a %s instead"), util.obj_name(ls_cloudcfg)) +                            " is a %s instead"), +                           type_utils.obj_name(ls_cloudcfg))      if not ls_cloudcfg:          return  | 
