From 8ff88d588b621fac74ffb7a798cfd54cf74729ed Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 18 Feb 2011 23:29:46 -0500 Subject: handle no datasource better cloud-init-cfg previously, cloud-init-cfg would call CloudConfig with no cloud specified. Then, CloudConfig would get a new cloudinit instance and specify no ds_deps (which means network and local). If no cache was found, it would wait again for the Ec2 metadata service (even if it wasn't supposed to). Now, we get the cloud instance in the main program and attempt to get the data source, but only from [], which will get only cached. Then, if its not found, exit silently. --- cloud-init-cfg.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cloud-init-cfg.py') diff --git a/cloud-init-cfg.py b/cloud-init-cfg.py index 49ddf302..0905eb5e 100755 --- a/cloud-init-cfg.py +++ b/cloud-init-cfg.py @@ -60,7 +60,14 @@ def main(): if os.environ.has_key(cfg_env_name): cfg_path = os.environ[cfg_env_name] - cc = CC.CloudConfig(cfg_path) + cloud = cloudinit.CloudInit(ds_deps=[]) # ds_deps=[], get only cached + try: + cloud.get_data_source() + except cloudinit.DataSourceNotFoundException as e: + # there was no datasource found, theres nothing to do + sys.exit(0) + + cc = CC.CloudConfig(cfg_path,cloud) try: (outfmt, errfmt) = CC.get_output_cfg(cc.cfg,modename) -- cgit v1.2.3