From 8edefffea218862e6edbc78830159a272e6ffc0d Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 25 Jan 2011 17:37:43 -0500 Subject: add get_config_obj to a DataSource object. This will allow for a DataSource to provide its own config that will then be utilized as part of CloudConfig. [to be used in OVF] --- cloudinit/CloudConfig/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cloudinit/CloudConfig') 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): -- cgit v1.2.3