diff options
Diffstat (limited to 'cloudinit/CloudConfig/__init__.py')
| -rw-r--r-- | cloudinit/CloudConfig/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cloudinit/CloudConfig/__init__.py b/cloudinit/CloudConfig/__init__.py index 22ad63a6..fe2dddcf 100644 --- a/cloudinit/CloudConfig/__init__.py +++ b/cloudinit/CloudConfig/__init__.py @@ -49,6 +49,13 @@ class CloudConfig(): cloudinit.log.debug(traceback.format_exc() + "\n") cfg = None if cfg is None: cfg = { } + + try: + ds_cfg = self.cloud.datasource.get_config_obj() + except: + ds_cfg = { } + + cfg = util.mergedict(cfg, ds_cfg) return(util.mergedict(cfg,self.cloud.cfg)) def handle(self, name, args, freq=None): |