diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-03-04 17:00:16 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-03-04 17:00:16 -0500 |
| commit | 068ee3d324350fd998e2a27e5be2991ea9bab52f (patch) | |
| tree | f7a1e0f8a2dc15e5555a3b97982c0475ec1e09dd /cloudinit/config/cc_locale.py | |
| parent | c808b84f1f6cdfe090a18b759a602eb504f36026 (diff) | |
| parent | e7cce1a06429813b8d2acc87e6609671d39a3254 (diff) | |
| download | vyos-cloud-init-068ee3d324350fd998e2a27e5be2991ea9bab52f.tar.gz vyos-cloud-init-068ee3d324350fd998e2a27e5be2991ea9bab52f.zip | |
pull in 'snappy' support
This allows config to disable some of the config modules that were
failing and logging WARN on snapy. Also adds the snappy module
and changes the syslog perms to take a list of user:groups rather
than just a single.
LP: #1428139
Diffstat (limited to 'cloudinit/config/cc_locale.py')
| -rw-r--r-- | cloudinit/config/cc_locale.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_locale.py b/cloudinit/config/cc_locale.py index 6feaae9d..bbe5fcae 100644 --- a/cloudinit/config/cc_locale.py +++ b/cloudinit/config/cc_locale.py @@ -27,9 +27,9 @@ def handle(name, cfg, cloud, log, args): else: locale = util.get_cfg_option_str(cfg, "locale", cloud.get_locale()) - if not locale: - log.debug(("Skipping module named %s, " - "no 'locale' configuration found"), name) + if util.is_false(locale): + log.debug("Skipping module named %s, disabled by config: %s", + name, locale) return log.debug("Setting locale to %s", locale) |