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)

diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 49c5f9c..18068c8 100644 (file)
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -70,6 +70,8 @@ outputs:
         map_merge:
           - get_attr: [AodhApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [AodhApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [AodhApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index 86bdfdf..077ad46 100644 (file)
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhEvaluatorBase, role_data, config_settings]
+      logging_source: {get_attr: [AodhEvaluatorBase, role_data, logging_source]}
+      logging_groups: {get_attr: [AodhEvaluatorBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 3f986ab..4471884 100644 (file)
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhListenerBase, role_data, config_settings]
+      logging_source: {get_attr: [AodhListenerBase, role_data, logging_source]}
+      logging_groups: {get_attr: [AodhListenerBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index 852120c..ffed5af 100644 (file)
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhNotifierBase, role_data, config_settings]
+      logging_source: {get_attr: [AodhNotifierBase, role_data, logging_source]}
+      logging_groups: {get_attr: [AodhNotifierBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml
index b1bf7da..1aa000b 100644 (file)
--- a/docker/services/barbican-api.yaml
+++ b/docker/services/barbican-api.yaml
@@ -71,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [BarbicanApiBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [BarbicanApiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [BarbicanApiBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"
@@ -151,4 +153,4 @@ outputs:
           tags: step2
           service: name=openstack-barbican-api state=stopped enabled=no
       metadata_settings:
-        get_attr: [BarbicanApiBase, role_data, metadata_settings]
\ No newline at end of file
+        get_attr: [BarbicanApiBase, role_data, metadata_settings]

diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index d772462..7033e0b 100644 (file)
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -36,7 +36,6 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
-
 resources:
 
   ContainersCommon:
@@ -58,6 +57,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentCentralBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentCentralBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentCentralBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentCentralBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]}

diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 90b30d4..ccde928 100644 (file)
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentComputeBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentComputeBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentComputeBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentComputeBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}

diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index 82d55be..a139f29 100644 (file)
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentIpmiBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]}

diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index 891750a..6c49513 100644 (file)
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentNotificationBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]}

diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 0670530..93890d0 100644 (file)
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -68,6 +68,8 @@ outputs:
     value:
       service_name: {get_attr: [CinderBase, role_data, service_name]}
       config_settings: {get_attr: [CinderBase, role_data, config_settings]}
+      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml
index ad3b43c..53febdb 100644 (file)
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@@ -62,6 +62,8 @@ outputs:
     value:
       service_name: {get_attr: [CinderBase, role_data, service_name]}
       config_settings: {get_attr: [CinderBase, role_data, config_settings]}
+      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index 1ac3187..fa9d241 100644 (file)
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -62,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [CinderBase, role_data, service_name]}
       config_settings: {get_attr: [CinderBase, role_data, config_settings]}
+      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index eb904c0..88e7712 100644 (file)
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -73,6 +73,8 @@ outputs:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]
           - tripleo::profile::base::lvm::enable_udev: false
+      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 3c0ba09..ef7ddc5 100644 (file)
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -63,6 +63,8 @@ outputs:
           - get_attr: [CollectdBase, role_data, config_settings]
           - tripleo::profile::base::metrics::collectd::enable_file_logging: true
             collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
+      logging_source: {get_attr: [CollectdBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CollectdBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CollectdBase, role_data, step_config]
       service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}

diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index 08170ce..ba899b8 100644 (file)
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CongressBase, role_data, config_settings]
+      logging_source: {get_attr: [CongressBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CongressBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 5cf6f92..b933be9 100644 (file)
--- 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 402dc35..c434ab7 100644 (file)
--- 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 487b4c6..627a40e 100644 (file)
--- 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]}

diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 1d4ddd3..48f1da4 100644 (file)
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -60,6 +60,8 @@ outputs:
     value:
       service_name: {get_attr: [Ec2ApiPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [Ec2ApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [Ec2ApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 42c9f2d..019b8c1 100644 (file)
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -57,6 +57,8 @@ outputs:
     description: Role data for the etcd role.
     value:
       service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
+      logging_source: {get_attr: [EtcdPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [EtcdPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 8f2bd60..f23ec35 100644 (file)
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -78,6 +78,8 @@ outputs:
         map_merge:
           - get_attr: [GlanceApiPuppetBase, role_data, config_settings]
           - glance::api::sync_db: false
+      logging_source: {get_attr: [GlanceApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GlanceApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 47b3b81..96f6ab9 100644 (file)
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -71,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [GnocchiApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [GnocchiApiPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]}

diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 9a11445..b966fa6 100644 (file)
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [GnocchiMetricdBase, role_data, service_name]}
       config_settings: {get_attr: [GnocchiMetricdBase, role_data, config_settings]}
+      logging_source: {get_attr: [GnocchiMetricdBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiMetricdBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index 834d005..0ebc83f 100644 (file)
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [GnocchiStatsdBase, role_data, service_name]}
       config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
+      logging_source: {get_attr: [GnocchiStatsdBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GnocchiStatsdBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index 70e1f89..b6c4352 100644 (file)
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -100,6 +100,8 @@ outputs:
             # NOTE(jaosorior): We disable the CRL since we have no way to restart haproxy
             # when this is updated
             tripleo::haproxy::crl_file: null
+      logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [HAProxyBase, role_data, step_config]
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}

diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index cfe11cd..84bc067 100644 (file)
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -69,6 +69,8 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [HeatBase, role_data, step_config]
       service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}

diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 2bb588d..75d0b8c 100644 (file)
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -71,6 +71,8 @@ outputs:
           - apache::default_vhost: false
       step_config: &step_config
         get_attr: [HeatBase, role_data, step_config]
+      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index fdba7d5..21ae242 100644 (file)
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -65,6 +64,8 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 9a2c8ba..d6ffb6d 100644 (file)
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -73,6 +73,8 @@ outputs:
               access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
               options: ['FollowSymLinks','MultiViews']
           - horizon::secure_cookies: false
+      logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}
       step_config: {get_attr: [HorizonBase, role_data, step_config]}
       service_config_settings: {get_attr: [HorizonBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS

diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 38710f3..156e5f9 100644 (file)
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -64,6 +64,8 @@ outputs:
         map_merge:
           - get_attr: [IronicApiBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [IronicApiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [IronicApiBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 37f4d46..465aa8b 100644 (file)
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -71,6 +71,8 @@ outputs:
           - ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
           - ironic::pxe::http_root: /var/lib/ironic/httpboot
           - ironic::conductor::http_root: /var/lib/ironic/httpboot
+      logging_source: {get_attr: [IronicConductorBase, role_data, logging_source]}
+      logging_groups: {get_attr: [IronicConductorBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index c34a59d..da9b1b2 100644 (file)
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -57,6 +57,8 @@ outputs:
     value:
       service_name: {get_attr: [IscsidBase, role_data, service_name]}
       config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
+      logging_source: {get_attr: [IscsidBase, role_data, logging_source]}
+      logging_groups: {get_attr: [IscsidBase, role_data, logging_groups]}
       step_config: &step_config
         {get_attr: [IscsidBase, role_data, step_config]}
       service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}

diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 8f4a201..26cef61 100644 (file)
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -81,6 +81,8 @@ outputs:
         map_merge:
           - get_attr: [KeystoneBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
+      logging_groups: {get_attr: [KeystoneBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index a0e501e..d2360f9 100644 (file)
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -59,6 +59,8 @@ outputs:
     value:
       service_name: {get_attr: [ManilaApiPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [ManilaApiPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [ManilaApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ManilaApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml
index 7b5dfec..931ce23 100644 (file)
--- a/docker/services/manila-scheduler.yaml
+++ b/docker/services/manila-scheduler.yaml
@@ -59,6 +59,8 @@ outputs:
     value:
       service_name: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 332ba86..cf3303c 100644 (file)
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [ManilaBase, role_data, service_name]}
       config_settings: {get_attr: [ManilaBase, role_data, config_settings]}
+      logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index 7e28bdc..c78b85a 100644 (file)
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [MemcachedBase, role_data, service_name]}
       config_settings: {get_attr: [MemcachedBase, role_data, config_settings]}
+      logging_source: {get_attr: [MemcachedBase, role_data, logging_source]}
+      logging_groups: {get_attr: [MemcachedBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [MemcachedBase, role_data, step_config]
       service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}

diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 38b97ae..50c8021 100644 (file)
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralApiBase, role_data, config_settings]
+      logging_source: {get_attr: [MistralApiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [MistralApiBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index 2b498be..12f7779 100644 (file)
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -64,6 +64,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
+      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
+      logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index e106fe4..0ee7d53 100644 (file)
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -64,6 +64,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
+      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
+      logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index c028fc2..11ab93b 100644 (file)
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -67,6 +67,8 @@ outputs:
     description: Role data for the Neutron API role.
     value:
       service_name: {get_attr: [NeutronBase, role_data, service_name]}
+      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 4b75d54..4b5a271 100644 (file)
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -60,6 +60,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
+      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronBase, role_data, step_config]
       service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}

diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 06470c0..09232c2 100644 (file)
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [NeutronL3Base, role_data, service_name]}
       config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
+      logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronL3Base, role_data, step_config]
       puppet_config:

diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml
index a5a7c34..9fe839e 100644 (file)
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [NeutronMetadataBase, role_data, service_name]}
       config_settings: {get_attr: [NeutronMetadataBase, role_data, config_settings]}
+      logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronMetadataBase, role_data, step_config]
       puppet_config:

diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 81bb1c2..246008c 100644 (file)
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -58,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [NeutronOvsAgentBase, role_data, service_name]}
       config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]}
+      logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronOvsAgentBase, role_data, step_config]
       puppet_config:

diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 8d12e0d..88d46ca 100644 (file)
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -53,6 +53,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
+      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NeutronBase, role_data, step_config]
       service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}

diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 9f1ae86..ed4a617 100644 (file)
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -71,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [NovaApiBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [NovaApiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaApiBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 34f56cd..c484671 100644 (file)
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -71,6 +71,8 @@ outputs:
       service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
       config_settings:
         get_attr: [NovaComputeBase, role_data, config_settings]
+      logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 17d137c..56275b0 100644 (file)
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -65,6 +65,8 @@ outputs:
     value:
       service_name: {get_attr: [NovaConductorBase, role_data, service_name]}
       config_settings: {get_attr: [NovaConductorBase, role_data, config_settings]}
+      logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml
index 715a861..85078f1 100644 (file)
--- a/docker/services/nova-consoleauth.yaml
+++ b/docker/services/nova-consoleauth.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [NovaConsoleauthPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [NovaConsoleauthPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 543758a..1bed40e 100644 (file)
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
+      logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index c059cfa..df16894 100644 (file)
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -116,6 +116,8 @@ outputs:
           - get_attr: [NovaLibvirtBase, role_data, config_settings]
           - tripleo::profile::base::certmonger_user::libvirt_postsave_cmd: "true" # TODO: restart the libvirt container here
 
+      logging_source: {get_attr: [NovaLibvirtBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaLibvirtBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index 53ae791..54d9312 100644 (file)
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@@ -60,6 +60,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NovaMetadataBase, role_data, config_settings]
+      logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaMetadataBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [NovaMetadataBase, role_data, step_config]
       service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}

diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index 904a042..cb3b950 100644 (file)
--- a/docker/services/nova-migration-target.yaml
+++ b/docker/services/nova-migration-target.yaml
@@ -106,6 +106,8 @@ outputs:
               tripleo::profile::base::nova::migration::proxy::target_port: {get_param: DockerNovaMigrationSshdPort}
               tripleo::profile::base::nova::migration::proxy::target_host: "%{hiera('live_migration_ssh_inbound_addr')}"
             - {}
+      logging_source: {get_attr: [NovaMigrationTargetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaMigrationTargetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index d66a6fb..8015071 100644 (file)
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -71,6 +71,8 @@ outputs:
         map_merge:
           - get_attr: [NovaPlacementBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaPlacementBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index 8d8a635..e75df94 100644 (file)
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [NovaSchedulerBase, role_data, service_name]}
       config_settings: {get_attr: [NovaSchedulerBase, role_data, config_settings]}
+      logging_source: {get_attr: [NovaSchedulerBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaSchedulerBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml
index c5f651d..f1bb0eb 100644 (file)
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/docker/services/nova-vnc-proxy.yaml
@@ -61,6 +61,8 @@ outputs:
     value:
       service_name: {get_attr: [NovaVncProxyPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [NovaVncProxyPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index da69899..c5e729c 100644 (file)
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@@ -69,6 +69,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaApiPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index f5e1eda..38c4faf 100644 (file)
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]}

diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index 1dc0db3..64e4f48 100644 (file)
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]}

diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index d29e1a3..e00f6bb 100644 (file)
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -37,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]}

diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index 2a6fcfe..dbe49e9 100644 (file)
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@@ -60,6 +60,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OpenDaylightBase, role_data, config_settings]
+      logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OpenDaylightBase, role_data, step_config]
       # BEGIN DOCKER SETTINGS

diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml
index c5c365e..285d14b 100644 (file)
--- a/docker/services/ovn-controller.yaml
+++ b/docker/services/ovn-controller.yaml
@@ -60,6 +60,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OvnControllerBase, role_data, config_settings]
+      logging_source: {get_attr: [OvnControllerBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OvnControllerBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OvnControllerBase, role_data, step_config]
       service_config_settings: {get_attr: [OvnControllerBase, role_data, service_config_settings]}

diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml
index f6ac62e..977f95f 100644 (file)
--- a/docker/services/ovn-dbs.yaml
+++ b/docker/services/ovn-dbs.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OVNDbsBase, role_data, config_settings]
+      logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OVNDbsBase, role_data, step_config]
       # BEGIN DOCKER SETTINGS

diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index cdb8c1b..46b9932 100644 (file)
--- 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 15c5e09..2f68b12 100644 (file)
--- 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 c7c316a..69f306b 100644 (file)
--- 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 9dace27..936272f 100644 (file)
--- 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 4d26a08..bcda4ef 100644 (file)
--- 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 2cc04e9..ba0f0ef 100644 (file)
--- 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 805f101..a31c1c7 100644 (file)
--- 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 03c5a39..1658b09 100644 (file)
--- 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 7333689..5660856 100644 (file)
--- 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]}

diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 3edd904..7987c8d 100644 (file)
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -73,6 +73,8 @@ outputs:
         map_merge:
           - get_attr: [PankoApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
+      logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [PankoApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index add7887..632bdc2 100644 (file)
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -82,6 +82,8 @@ outputs:
             - internal_tls_enabled
             - tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
             - {}
+      logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
+      logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index b0c3736..ab8cef1 100644 (file)
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -62,6 +62,8 @@ outputs:
         map_merge:
           - get_attr: [SaharaApiPuppetBase, role_data, config_settings]
           - sahara::sync_db: false
+      logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaApiPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index b166029..0884116 100644 (file)
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -62,6 +62,8 @@ outputs:
         map_merge:
           - get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
           - sahara::sync_db: false
+      logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaEnginePuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 8687121..2d745f7 100644 (file)
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -67,6 +67,8 @@ outputs:
       config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
       step_config: &step_config
         get_attr: [SwiftProxyBase, role_data, step_config]
+      logging_source: {get_attr: [SwiftProxyBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SwiftProxyBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 2a44f70..bfb57ed 100644 (file)
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -91,6 +91,8 @@ outputs:
         map_merge:
           - {get_attr: [SwiftRingbuilderBase, role_data, config_settings]}
           - tripleo::profile::base::swift::ringbuilder:skip_consistency_check: true
+      logging_source: {get_attr: [SwiftRingbuilderBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SwiftRingbuilderBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [SwiftRingbuilderBase, role_data, step_config]
       service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index e879b25..108a036 100644 (file)
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -77,6 +77,8 @@ outputs:
           - {get_attr: [SwiftStorageBase, role_data, config_settings]}
           # FIXME (cschwede): re-enable this once checks works inside containers
           - swift::storage::all::mount_check: false
+      logging_source: {get_attr: [SwiftStorageBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SwiftStorageBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [SwiftStorageBase, role_data, step_config]
       service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}

diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 1b7d78c..9bd5de2 100644 (file)
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -63,6 +63,8 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [TackerBase, role_data, config_settings]
+      logging_source: {get_attr: [TackerBase, role_data, logging_source]}
+      logging_groups: {get_attr: [TackerBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index ab30ab5..ff40cb1 100644 (file)
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -73,6 +73,8 @@ outputs:
     value:
       service_name: {get_attr: [ZaqarBase, role_data, service_name]}
       config_settings: {get_attr: [ZaqarBase, role_data, config_settings]}
+      logging_source: {get_attr: [ZaqarBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ZaqarBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"

diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 66ac101..de8ba80 100755 (executable)
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -37,7 +37,7 @@ REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config',
 OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
                             'post_upgrade_tasks', 'service_config_settings',
                             'host_prep_tasks', 'metadata_settings',
-                            'kolla_config']
+                            'kolla_config', 'logging_source', 'logging_groups']
 REQUIRED_DOCKER_PUPPET_CONFIG_SECTIONS = ['config_volume', 'step_config',
                                           'config_image']
 OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags', 'volumes' ]