From c8c8c09890a21540bf3c9c0212e6e2c01aecc4db Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Wed, 27 Jun 2012 17:07:42 -0700
Subject: No longer need to do this special config appending, the config merger
 class handles this.

---
 bin/cloud-init | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'bin')

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")
-- 
cgit v1.2.3