diff options
| author | James Falcon <james.falcon@canonical.com> | 2022-04-25 15:43:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 15:43:57 -0500 |
| commit | 3e02227236fc860bdf0937b2734b35c373fdb263 (patch) | |
| tree | 08511d62395e20c694a0e8829c4375b9803cce87 /cloudinit/stages.py | |
| parent | 43c1cf433281844c30f0e4a19a938f4459bfccb7 (diff) | |
| download | cloud-init-git-3e02227236fc860bdf0937b2734b35c373fdb263.tar.gz | |
Fix ds-identify not detecting NoCloud seed in config (#1381)
NoCloud seed config can be defined in /etc/cloud/cloud.cfg[.d].
However, ds-identify had no means of detecting this config and reported
NOT FOUND. This commit allows ds-identify to detect and report it
properly.
LP: #1876375
Diffstat (limited to 'cloudinit/stages.py')
| -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 e3f8b3ef..89b38147 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -1162,11 +1162,11 @@ def read_runtime_config(): def fetch_base_config(): return util.mergemanydict( [ - # builtin config + # builtin config, hardcoded in settings.py. util.get_builtin_cfg(), # Anything in your conf.d or 'default' cloud.cfg location. util.read_conf_with_confd(CLOUD_CONFIG), - # runtime config + # runtime config. I.e., /run/cloud-init/cloud.cfg read_runtime_config(), # Kernel/cmdline parameters override system config util.read_conf_from_cmdline(), |