diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
| commit | aefffff0e3df98a435133b598217401c3f953cc6 (patch) | |
| tree | 9a141352c311aa541f93de560fcfec9c0d213476 /cloudinit/stages.py | |
| parent | 3c85315373306729443ef79fd8e54af46a7bc849 (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.tar.gz vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.zip | |
merge with last upstream to avoid merging conflicts on MP
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 62d066de..002e5832 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -794,16 +794,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) |