openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Force C.UTF-8 when dealing with rabbitmq"

This commit is contained in:
Zuul 2019-04-02 22:13:44 +00:00 committed by Gerrit Code Review
parent bfc59e9382 a92d1fccc6
commit 52fce966c8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -252,7 +252,7 @@ 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',
options => '--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8',
run_command => '/bin/bash /usr/local/bin/kolla_start',
network => "control-port=${rabbitmq_docker_control_port}",
storage_maps => merge($storage_maps, $storage_maps_tls),