summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-03-04 14:49:44 -0500
committerScott Moser <smoser@ubuntu.com>2015-03-04 14:49:44 -0500
commit2db45b26d2e5412aa55b33ec924afce7c0dbd12c (patch)
tree81ecd2c858175bc75740785b38ff4b36728853fa /cloudinit
parentac445690ab7a69ac6e9c74b136de9968b0c839df (diff)
downloadvyos-cloud-init-2db45b26d2e5412aa55b33ec924afce7c0dbd12c.tar.gz
vyos-cloud-init-2db45b26d2e5412aa55b33ec924afce7c0dbd12c.zip
locale: make able to be turned off
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_locale.py6
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)