diff options
| author | Chad Smith <chad.smith@canonical.com> | 2017-10-23 14:46:12 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-10-23 14:46:12 -0600 |
| commit | a7f478aafa570abde940037014fabcb0eab16502 (patch) | |
| tree | d838e40b26684f33b3b05c24ead267e28bb1b5a3 /cloudinit/config/cc_ntp.py | |
| parent | 5443ede5e90c0be56f25ac729c5f341cdb4ad31c (diff) | |
| parent | 17a15f9e0ae78e4fc4e24fab0caebdf78f06ef66 (diff) | |
| download | vyos-cloud-init-a7f478aafa570abde940037014fabcb0eab16502.tar.gz vyos-cloud-init-a7f478aafa570abde940037014fabcb0eab16502.zip | |
merge from master at 17.1-25-g17a15f9e
Diffstat (limited to 'cloudinit/config/cc_ntp.py')
| -rw-r--r-- | cloudinit/config/cc_ntp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py index 15ae1ecd..d43d060c 100644 --- a/cloudinit/config/cc_ntp.py +++ b/cloudinit/config/cc_ntp.py @@ -100,7 +100,9 @@ def handle(name, cfg, cloud, log, _args): LOG.debug( "Skipping module named %s, not present or disabled by cfg", name) return - ntp_cfg = cfg.get('ntp', {}) + ntp_cfg = cfg['ntp'] + if ntp_cfg is None: + ntp_cfg = {} # Allow empty config which will install the package # TODO drop this when validate_cloudconfig_schema is strict=True if not isinstance(ntp_cfg, (dict)): |