diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-27 17:07:42 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-06-27 17:07:42 -0700 |
| commit | c8c8c09890a21540bf3c9c0212e6e2c01aecc4db (patch) | |
| tree | 409616369f4bd628100f2e1234666cd79a872969 /bin/cloud-init | |
| parent | fc41d0b114ba6b6bd37d4701aeb1c8125b0e4c2d (diff) | |
| download | vyos-cloud-init-c8c8c09890a21540bf3c9c0212e6e2c01aecc4db.tar.gz vyos-cloud-init-c8c8c09890a21540bf3c9c0212e6e2c01aecc4db.zip | |
No longer need to do this special config appending, the config merger class handles this.
Diffstat (limited to 'bin/cloud-init')
| -rwxr-xr-x | bin/cloud-init | 8 |
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") |