From 00f62b8a0e118dee569ad8f90e93009a4ded1487 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 23 Aug 2016 13:34:07 -0700 Subject: locale improvements: allow non-english locales in node_init, enforce UTF8 locale for `puppet apply`. --- bin/puppet_command | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/puppet_command') diff --git a/bin/puppet_command b/bin/puppet_command index eb3cd0b9..dee3f5ce 100755 --- a/bin/puppet_command +++ b/bin/puppet_command @@ -28,7 +28,7 @@ SUMMARY_LOG = '/var/log/leap/deploy-summary.log' SUMMARY_LOG_1 = '/var/log/leap/deploy-summary.log.1' APPLY_START_STR = "STARTING APPLY" APPLY_FINISH_STR = "APPLY COMPLETE" - +LANG = "en_US.UTF-8" def main if File.read('/etc/debian_version') !~ DEBIAN_VERSION @@ -144,7 +144,7 @@ def puppet_apply(options={}, &block) fqdn = hiera_file['domain']['full'] domain = hiera_file['domain']['full_suffix'] Dir.chdir(PUPPET_DIRECTORY) do - return run("FACTER_fqdn='#{fqdn}' FACTER_domain='#{domain}' #{PUPPET_BIN} apply #{custom_parameters(options)} --modulepath='#{modulepath}' #{PUPPET_PARAMETERS} #{manifest}", &block) + return run("LANG='#{LANG}' FACTER_fqdn='#{fqdn}' FACTER_domain='#{domain}' #{PUPPET_BIN} apply #{custom_parameters(options)} --modulepath='#{modulepath}' #{PUPPET_PARAMETERS} #{manifest}", &block) end end -- cgit v1.2.3