Merge "Ensure LANG env is properly set when puppet runs." into stable/queens
This commit is contained in:
commit
b003b4dd6d
|
@ -230,6 +230,8 @@ with open(sh_script, 'w') as script_file:
|
||||||
# $::deployment_type in puppet-tripleo
|
# $::deployment_type in puppet-tripleo
|
||||||
export FACTER_deployment_type=containers
|
export FACTER_deployment_type=containers
|
||||||
export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lower:]')
|
export FACTER_uuid=$(cat /sys/class/dmi/id/product_uuid | tr '[:upper:]' '[:lower:]')
|
||||||
|
: ${LANG=en_US.UTF-8}
|
||||||
|
export LANG
|
||||||
FACTER_hostname=$HOSTNAME /usr/bin/puppet apply --summarize \
|
FACTER_hostname=$HOSTNAME /usr/bin/puppet apply --summarize \
|
||||||
--detailed-exitcodes --color=false --logdest syslog --logdest console --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules $TAGS /etc/config.pp
|
--detailed-exitcodes --color=false --logdest syslog --logdest console --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules $TAGS /etc/config.pp
|
||||||
rc=$?
|
rc=$?
|
||||||
|
|
Loading…
Reference in New Issue