summaryrefslogtreecommitdiffstats
path: root/docker/services/database
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/database
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/database')
-rw-r--r--docker/services/database/mongodb.yaml2
-rw-r--r--docker/services/database/mysql.yaml2
-rw-r--r--docker/services/database/redis.yaml2
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 5cf6f925..b933be96 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -70,6 +70,8 @@ outputs:
map_merge:
- get_attr: [MongodbPuppetBase, role_data, config_settings]
- mongodb::server::fork: false
+ logging_source: {get_attr: [MongodbPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MongodbPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 402dc351..c434ab76 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -79,6 +79,8 @@ outputs:
pid-file: /var/lib/mysql/mariadb.pid
mysqld_safe:
pid-file: /var/lib/mysql/mariadb.pid
+ logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 487b4c67..627a40e8 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -68,6 +68,8 @@ outputs:
- redis::daemonize: false
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: &step_config
get_attr: [RedisBase, role_data, step_config]
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}