openstack
/
puppet-tripleo
Code Issues Proposed changes

Fix RabbitMQ locale for CentOS 7 (Puppet part) 

It seems that CentOS 7 does not have C.UTF-8 locale. Since we need
UTF-8-based locale, use en_US.UTF-8 instead.

Change-Id: I25d2b9a227a7c5de127bdfd9d2f387be9eea01e0
Partial-Bug: #1823062
This commit is contained in:
Jiri Stransky 2019-04-03 20:53:01 +02:00 committed by Michele Baldessari
parent 81d7714744
commit 566703dc27
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/rabbitmq.pp
View File

@ -155,8 +155,8 @@ class tripleo::profile::base::rabbitmq (
$environment_real = merge($environment, {
'RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS' => $rabbitmq_additional_erl_args,
'RABBITMQ_CTL_ERL_ARGS' => $rabbitmq_additional_erl_args,
'LANG' => 'C.UTF-8',
'LC_ALL' => 'C.UTF-8'
'LANG' => 'en_US.UTF-8',
'LC_ALL' => 'en_US.UTF-8'
})
# Configure a list of secure transport protocols, unless the
# user explicitly sets one

4
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -252,7 +252,9 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
expression => ['rabbitmq-role eq true'],
},
container_options => 'network=host',
options => '--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8',
# lint:ignore:140chars
options => '--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=en_US.UTF-8 -e LC_ALL=en_US.UTF-8',
# lint:endignore
run_command => '/bin/bash /usr/local/bin/kolla_start',
network => "control-port=${rabbitmq_docker_control_port}",
storage_maps => merge($storage_maps, $storage_maps_tls),