Updated so that the locale that is being written out currently in 'cc_locale'

now will be done by the distro classes (since its not the same for rhel and ubuntu).

Remove the template also since it will just be created by the ubuntu distro class (its just one line).

1 files changed, 2 insertions, 23 deletions

diff --git a/cloudinit/config/cc_locale.py b/cloudinit/config/cc_locale.py
index 3fb4c5d9..6feaae9d 100644
--- a/cloudinit/config/cc_locale.py
+++ b/cloudinit/config/cc_locale.py
@@ -18,41 +18,20 @@
 #    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 os
-
-from cloudinit import templater
 from cloudinit import util
 
 
-def apply_locale(locale, cfgfile, cloud, log):
-    # TODO this command might not work on RH...
-    if os.path.exists('/usr/sbin/locale-gen'):
-        util.subp(['locale-gen', locale], capture=False)
-    if os.path.exists('/usr/sbin/update-locale'):
-        util.subp(['update-locale', locale], capture=False)
-    if not cfgfile:
-        return
-    template_fn = cloud.get_template_filename('default-locale')
-    if not template_fn:
-        log.warn("No template filename found to write to %s", cfgfile)
-    else:
-        templater.render_to_file(template_fn, cfgfile, {'locale': locale})
-
-
 def handle(name, cfg, cloud, log, args):
     if len(args) != 0:
         locale = args[0]
     else:
         locale = util.get_cfg_option_str(cfg, "locale", cloud.get_locale())
 
-    locale_cfgfile = util.get_cfg_option_str(cfg, "locale_configfile",
-                                             "/etc/default/locale")
-
     if not locale:
         log.debug(("Skipping module named %s, "
                    "no 'locale' configuration found"), name)
         return
 
     log.debug("Setting locale to %s", locale)
-
-    apply_locale(locale, locale_cfgfile, cloud, log)
+    locale_cfgfile = util.get_cfg_option_str(cfg, "locale_configfile")
+    cloud.distro.apply_locale(locale, locale_cfgfile)