Merge "Ensure LANG env is properly set when puppet runs." into stable/ussuri
This commit is contained in:
commit
8f21d262b4
|
@ -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',
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue