openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Ensure LANG env is properly set when puppet runs. 

When puppet run it must support UTF-8 or whatever is the locale on the
host.  So we make sure that we pass down the LANG to the container and
that the puppet process collect it properly.

Closes-Bug: #1896640

Change-Id: Ic7bd6956f869acbee6a253269d4c3972532499e2
Co-Authored-By: Sofer Athlan-Guyot <sathlang@redhat.com>
Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
Co-Authored-By: Daniel Bengtsson <dbengt@redhat.com>
This commit is contained in:
Sofer Athlan-Guyot 2020-09-22 18:55:14 +02:00 committed by Daniel Bengtsson
parent 47829fffb7
commit b3521d5423
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/container-puppet.py
View File

@ -206,6 +206,8 @@ def mp_puppet_config(*args):
'NET_HOST=%s' % os.environ.get('NET_HOST', 'false'),
'--env',
'DEBUG=%s' % os.environ.get('DEBUG', 'false'),
'--env',
'LANG=%s' % os.environ.get('LANG', 'en_US.UTF-8'),
'--volume',
'/etc/localtime:/etc/localtime:ro',
'--volume',

16
common/container-puppet.sh
View File

@ -52,14 +52,14 @@ export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lowe
echo 'Running puppet'
# FIXME(bogdando): stdout may be falling behind of the logged syslog messages
set -x
/usr/bin/puppet apply --summarize \
--detailed-exitcodes \
--color=false \
--modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules \
$TAGS \
$CHECK_MODE \
/etc/config.pp \
2>&1 | logger -s -t puppet-user
env "LANG=${LANG:-en_US.UTF-8}" /usr/bin/puppet apply --summarize \
--detailed-exitcodes \
--color=false \
--modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules \
$TAGS \
$CHECK_MODE \
/etc/config.pp \
2>&1 | logger -s -t puppet-user
rc=${PIPESTATUS[0]}
[ "$DEBUG" = "false" ] && set +x
set -e