diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2012-07-01 12:11:21 -0700 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2012-07-01 12:11:21 -0700 |
| commit | 9e1ffb27f4f316638a1fe83678c19f7215a8ef4b (patch) | |
| tree | 057ed31c2b2149c46fc459f41a9a2d7719f73f8a | |
| parent | 25712b40dfbe197c1ad8bdc783a2235e3c87c7de (diff) | |
| download | vyos-cloud-init-9e1ffb27f4f316638a1fe83678c19f7215a8ef4b.tar.gz vyos-cloud-init-9e1ffb27f4f316638a1fe83678c19f7215a8ef4b.zip | |
Always read fro the cloud config location + conf.d locations
| -rw-r--r-- | cloudinit/stages.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |