summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/cloud-init8
1 files changed, 1 insertions, 7 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 68c7ba76..0b879876 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -253,13 +253,7 @@ def main_modules(action_name, args):
util.logexc(LOG, 'Can not apply stage %s, no datasource found!', name)
return 1
# Stage 3
- mod_cfgs = extract_fns(args)
- cc_cfg = init.paths.get_ipath_cur('cloud_config')
- if settings.CFG_ENV_NAME in os.environ:
- cc_cfg = os.environ[settings.CFG_ENV_NAME]
- if cc_cfg and os.path.exists(cc_cfg):
- mod_cfgs.append(cc_cfg)
- mods = stages.Modules(init, mod_cfgs)
+ mods = stages.Modules(init, extract_fns(args))
# Stage 4
try:
LOG.debug("Closing stdin")