diff options
| -rwxr-xr-x | cloud-init.py | 10 | ||||
| -rw-r--r-- | cloudinit/CloudConfig/cc_locale.py | 43 | ||||
| -rw-r--r-- | config/cloud.cfg | 1 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 3 |
4 files changed, 47 insertions, 10 deletions
diff --git a/cloud-init.py b/cloud-init.py index 11bf89af..28828648 100755 --- a/cloud-init.py +++ b/cloud-init.py @@ -115,16 +115,6 @@ def main(): sys.exit(0) -def set_defaults(cloud): - apply_locale(cloud.get_locale()) - -def apply_locale(locale): - subprocess.Popen(['locale-gen', locale]).communicate() - subprocess.Popen(['update-locale', locale]).communicate() - - util.render_to_file('default-locale', '/etc/default/locale', \ - { 'locale' : locale }) - # read hostname from a 'hostname' file # allow for comments and stripping line endings. # if file doesn't exist, or no contents, return default diff --git a/cloudinit/CloudConfig/cc_locale.py b/cloudinit/CloudConfig/cc_locale.py new file mode 100644 index 00000000..12cf6f04 --- /dev/null +++ b/cloudinit/CloudConfig/cc_locale.py @@ -0,0 +1,43 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: Scott Moser <scott.moser@canonical.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import cloudinit.util as util +import subprocess +import traceback + +def apply_locale(locale): + subprocess.Popen(['locale-gen', locale]).communicate() + subprocess.Popen(['update-locale', locale]).communicate() + + util.render_to_file('default-locale', '/etc/default/locale', \ + { 'locale' : locale }) + +def handle(name,cfg,cloud,log,args): + if len(args) != 0: + value = args[0] + else: + locale = util.get_cfg_option_str(cfg,"locale",cloud.get_locale()) + + if not locale: return + + log.debug("setting locale to %s" % locale) + + try: + apply_locale(locale) + except Exception, e: + log.debug(traceback.format_exc(e)) + raise Exception("failed to apply locale %s" % locale) diff --git a/config/cloud.cfg b/config/cloud.cfg index 3e7556d2..0bff9a88 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -6,6 +6,7 @@ preserve_hostname: False cloud_config_modules: - mounts - ssh-import-id + - locale - ssh - grub-dpkg - apt-update-upgrade diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index c1510743..70724590 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -246,3 +246,6 @@ byobu_by_default: system # rather than as the 'ubuntu' user, then you must set this to false # default: true disable_root: false + +# set the locale to a given locale +# default: en_US.UTF-8 |