diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-01-25 17:37:43 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-01-25 17:37:43 -0500 |
| commit | 8edefffea218862e6edbc78830159a272e6ffc0d (patch) | |
| tree | c9d21bf403b929e844a0038d2d326210e6bc8e45 /cloudinit/CloudConfig | |
| parent | 7d89aaeab6efeda1c4b061c59c7b62afb46be70b (diff) | |
| download | vyos-cloud-init-8edefffea218862e6edbc78830159a272e6ffc0d.tar.gz vyos-cloud-init-8edefffea218862e6edbc78830159a272e6ffc0d.zip | |
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]
Diffstat (limited to 'cloudinit/CloudConfig')
| -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): |