openstack
/
puppet-tripleo
Code Issues Proposed changes

Conventional log directories for pacemaker bundles 

Use /var/log/containers/<service> instead of /var/log/<service>, as
the rest of the containerized services.

Change-Id: Id5760c16260de991ff95168c76186edc113752c8
Depends-On: Icb311984104eac16cd391d75613517f62ccf6696
Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
Closes-Bug: #1731969
(cherry picked from commit d8d86cfe68)
This commit is contained in:
Jiri Stransky 2017-11-13 17:31:47 +01:00 committed by Damien Ciabrini
parent 0e61fab9cd
commit b25e2fbed0
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -301,11 +301,18 @@ MYSQL_HOST=localhost\n",
'target-dir' => '/var/lib/mysql',
'options' => 'rw',
},
# NOTE: we cannot remove this bind mount until the resource-agent
# can use the configured log-file for initial bootstrap operations
'mysql-log-mariadb' => {
'source-dir' => '/var/log/mariadb',
'target-dir' => '/var/log/mariadb',
'options' => 'rw',
},
'mysql-log' => {
'source-dir' => '/var/log/containers/mysql',
'target-dir' => '/var/log/mysql',
'options' => 'rw',
},
'mysql-dev-log' => {
'source-dir' => '/dev/log',
'target-dir' => '/dev/log',
@ -363,7 +370,7 @@ MYSQL_HOST=localhost\n",
master_params => '',
meta_params => "master-max=${galera_nodes_count} ordered=true container-attribute-target=host",
op_params => 'promote timeout=300s on-fail=block',
resource_params => "additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map_string}'",
resource_params => "log='/var/log/mysql/mysqld.log' additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}' cluster_host_map='${cluster_host_map_string}'",
tries => $pcs_tries,
location_rule => {
resource_discovery => 'exclusive',

2
manifests/profile/pacemaker/database/redis_bundle.pp
View File

@ -249,7 +249,7 @@ slave-announce-port ${local_tuple[0][2]}
'options' => 'rw',
},
'redis-log' => {
'source-dir' => '/var/log/redis',
'source-dir' => '/var/log/containers/redis',
'target-dir' => '/var/log/redis',
'options' => 'rw',
},

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

@ -153,6 +153,11 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
'target-dir' => '/etc/pki/tls/cert.pem',
'options' => 'ro',
},
'rabbitmq-log' => {
'source-dir' => '/var/log/containers/rabbitmq',
'target-dir' => '/var/log/rabbitmq',
'options' => 'rw',
},
'rabbitmq-dev-log' => {
'source-dir' => '/dev/log',
'target-dir' => '/dev/log',