summaryrefslogtreecommitdiffstats
path: root/docker/services/pacemaker
diff options
context:
space:
mode:
authorJuan Badia Payno <jbadiapa@redhat.com>2017-08-31 11:07:11 +0200
committerMartin Mágr <mmagr@redhat.com>2017-10-09 11:38:44 +0200
commit404c14e4d6f795d5ba7265a819dccc86a5ecb4e1 (patch)
tree5d410d8821ced87fa3d3f5d8ef2147711d462f60 /docker/services/pacemaker
parent6fea40f786a466802503c03b2b815d05676e1807 (diff)
docker: add logging(source & groups)
The services that docker depends on, have logging_sources and logging_groups; but those are not set on the docker outputs so they are not used when dockers are deployed. Added logging_source & logging_groups as docker optional parameters in tools/yaml-validate.py Closes-Bug: #1718110 Change-Id: I8795eaf4bd06051e9b94aa50450dee0d8761e526 (cherry picked from commit 5dbe1121e98a794ec6a6387ff56ee34314177567)
Diffstat (limited to 'docker/services/pacemaker')
-rw-r--r--docker/services/pacemaker/cinder-backup.yaml2
-rw-r--r--docker/services/pacemaker/cinder-volume.yaml2
-rw-r--r--docker/services/pacemaker/clustercheck.yaml2
-rw-r--r--docker/services/pacemaker/database/mysql.yaml2
-rw-r--r--docker/services/pacemaker/database/redis.yaml2
-rw-r--r--docker/services/pacemaker/haproxy.yaml2
-rw-r--r--docker/services/pacemaker/manila-share.yaml2
-rw-r--r--docker/services/pacemaker/ovn-dbs.yaml2
-rw-r--r--docker/services/pacemaker/rabbitmq.yaml2
9 files changed, 18 insertions, 0 deletions
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index cdb8c1bc..46b9932a 100644
--- a/docker/services/pacemaker/cinder-backup.yaml
+++ b/docker/services/pacemaker/cinder-backup.yaml
@@ -85,6 +85,8 @@ outputs:
- 'pcmklatest'
cinder::backup::manage_service: false
cinder::backup::enabled: false
+ logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
+ logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml
index 15c5e099..2f68b126 100644
--- a/docker/services/pacemaker/cinder-volume.yaml
+++ b/docker/services/pacemaker/cinder-volume.yaml
@@ -79,6 +79,8 @@ outputs:
cinder::volume::manage_service: false
cinder::volume::enabled: false
cinder::host: hostgroup
+ logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+ logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index c7c316a4..69f306b1 100644
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/docker/services/pacemaker/clustercheck.yaml
@@ -60,6 +60,8 @@ outputs:
value:
service_name: clustercheck
config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]}
+ logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
step_config: "include ::tripleo::profile::pacemaker::clustercheck"
# BEGIN DOCKER SETTINGS #
puppet_config:
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 9dace271..936272fa 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -104,6 +104,8 @@ outputs:
tripleo::profile::pacemaker::database::mysql_bundle::ca_file:
get_param: InternalTLSCAFile
- {}
+ logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
step_config: ""
# BEGIN DOCKER SETTINGS #
puppet_config:
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 4d26a084..bcda4efc 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/database/redis.yaml
@@ -86,6 +86,8 @@ outputs:
- 26379
tripleo::stunnel::manage_service: false
tripleo::stunnel::foreground: 'yes'
+ logging_source: {get_attr: [RedisBase, role_data, logging_source]}
+ logging_groups: {get_attr: [RedisBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 2cc04e96..ba0f0efc 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -99,6 +99,8 @@ outputs:
data: {get_param: DockerHAProxyImage}
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
+ logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
+ logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index 805f101c..a31c1c74 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/docker/services/pacemaker/manila-share.yaml
@@ -69,6 +69,8 @@ outputs:
manila::share::manage_service: false
manila::share::enabled: false
manila::host: hostgroup
+ logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
+ logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index 03c5a397..1658b093 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/docker/services/pacemaker/ovn-dbs.yaml
@@ -73,6 +73,8 @@ outputs:
- tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image: {get_param: DockerOvnDbsImage}
- tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort}
- tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
+ logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
+ logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
step_config: ''
service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index 7333689c..5660856a 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@ -77,6 +77,8 @@ outputs:
- 4369
- 5672
- 25672
+ logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
+ logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [RabbitmqBase, role_data, step_config]
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}