From 9e1ffb27f4f316638a1fe83678c19f7215a8ef4b Mon Sep 17 00:00:00 2001 From: harlowja Date: Sun, 1 Jul 2012 12:11:21 -0700 Subject: Always read fro the cloud config location + conf.d locations --- cloudinit/stages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 79663b27..8fd6aa5d 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -154,8 +154,8 @@ class Init(object): if kern_contents: base_cfgs.append(util.load_yaml(kern_contents, default={})) # Anything in your conf.d location?? - if os.path.isfile(CLOUD_CONFIG): - base_cfgs.append(util.read_conf_with_confd(CLOUD_CONFIG)) + # or the 'default' cloud.cfg location??? + base_cfgs.append(util.read_conf_with_confd(CLOUD_CONFIG)) # And finally the default gets to play if default_cfg: base_cfgs.append(default_cfg) -- cgit v1.2.3