diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-05-26 11:51:38 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-05-26 11:51:38 -0400 |
| commit | 4789f071a1ad7a437f257d3f1cb46d1ea3a52150 (patch) | |
| tree | 760f6efefb202211245ee89b298588fe56295e52 /cloudinit/stages.py | |
| parent | ac851b8ff106abb4314d2b71f2a7dc194b259899 (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-4789f071a1ad7a437f257d3f1cb46d1ea3a52150.tar.gz vyos-cloud-init-4789f071a1ad7a437f257d3f1cb46d1ea3a52150.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/stages.py')
| -rw-r--r-- | cloudinit/stages.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 5141612f..90c9016c 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -826,16 +826,16 @@ class Modules(object): def fetch_base_config(): base_cfgs = [] default_cfg = util.get_builtin_cfg() - kern_contents = util.read_cc_from_cmdline() - - # Kernel/cmdline parameters override system config - if kern_contents: - base_cfgs.append(util.load_yaml(kern_contents, default={})) # Anything in your conf.d location?? # or the 'default' cloud.cfg location??? base_cfgs.append(util.read_conf_with_confd(CLOUD_CONFIG)) + # Kernel/cmdline parameters override system config + kern_contents = util.read_cc_from_cmdline() + if kern_contents: + base_cfgs.append(util.load_yaml(kern_contents, default={})) + # And finally the default gets to play if default_cfg: base_cfgs.append(default_cfg) |