Remove references to logging_source

This has been unused for a while, and even deprecation was scheduled
(although the patch never merged [1]). So, in order to stop folks
getting confused with this, it's being removed.

[1] https://review.openstack.org/#/c/543871/

Change-Id: Iada64874432146ef311682f26af5990469790ed2

common/services.yaml

@@ -120,39 +120,6 @@ resources:
           data:
             cellv2_discovery: {get_attr: [ServiceChain, role_data, cellv2_discovery]}
 
-  LoggingSourcesConfig:
-    type: OS::Heat::Value
-    properties:
-      type: comma_delimited_list
-      value:
-        # Transform the individual logging_source configuration from
-        # each service in the chain into a global list, adding some
-        # default configuration at the same time.
-        yaql:
-          expression: >
-            let(
-            default_format => coalesce($.data.default_format, ''),
-            pos_file_path => coalesce($.data.pos_file_path, ''),
-            sources => coalesce($.data.sources, {}).flatten()
-            ) ->
-            $sources.where($ != null).select({
-            'type' => 'tail',
-            'tag' => $.tag,
-            'path' => $.path,
-            'format' => $.get('format', $default_format),
-            'pos_file' => $.get('pos_file', $pos_file_path + '/' + $.tag + '.pos')
-            })
-          data:
-            sources:
-              - {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
-              - yaql:
-                  expression: list(coalesce($.data.role_data, []).where($ != null).select($.get('logging_source')).where($ != null))
-                  data: {role_data: {get_attr: [ServiceChain, role_data]}}
-
-              - {get_attr: [LoggingConfiguration, LoggingExtraSources]}
-            default_format: {get_attr: [LoggingConfiguration, LoggingDefaultFormat]}
-            pos_file_path: {get_attr: [LoggingConfiguration, LoggingPosFilePath]}
-
   MonitoringSubscriptionsConfig:
     type: OS::Heat::Value
     properties:
@@ -368,7 +335,6 @@ outputs:
     value:
       service_names: {get_attr: [ServiceNames, value]}
       monitoring_subscriptions: {get_attr: [MonitoringSubscriptionsConfig, value]}
-      logging_sources: {get_attr: [LoggingSourcesConfig, value]}
       config_settings:
         yaql:
           expression: $.data.where($ != null).reduce($1.mergeWith($2), {})

docker/services/aodh-api.yaml

@@ -74,7 +74,6 @@ outputs:
         map_merge:
           - get_attr: [AodhApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [AodhApiPuppetBase, role_data, logging_source]}
       service_config_settings: {get_attr: [AodhApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/aodh-evaluator.yaml

@@ -67,7 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhEvaluatorBase, role_data, config_settings]
-      logging_source: {get_attr: [AodhEvaluatorBase, role_data, logging_source]}
       service_config_settings: {get_attr: [AodhEvaluatorBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/aodh-listener.yaml

@@ -67,7 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhListenerBase, role_data, config_settings]
-      logging_source: {get_attr: [AodhListenerBase, role_data, logging_source]}
       service_config_settings: {get_attr: [AodhListenerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/aodh-notifier.yaml

@@ -67,7 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhNotifierBase, role_data, config_settings]
-      logging_source: {get_attr: [AodhNotifierBase, role_data, logging_source]}
       service_config_settings: {get_attr: [AodhNotifierBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/barbican-api.yaml

@@ -86,7 +86,6 @@ outputs:
           - get_attr: [BarbicanApiBase, role_data, config_settings]
           - get_attr: [BarbicanApiLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [BarbicanApiBase, role_data, logging_source]}
       service_config_settings: {get_attr: [BarbicanApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ceilometer-agent-central.yaml

@@ -67,7 +67,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]

docker/services/ceilometer-agent-compute.yaml

@@ -62,7 +62,6 @@ 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]}
       service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ceilometer-agent-ipmi.yaml

@@ -67,7 +67,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]

docker/services/ceilometer-agent-notification.yaml

@@ -67,7 +67,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]

docker/services/cinder-api.yaml

@@ -77,7 +77,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, service_config_settings]

docker/services/cinder-backup.yaml

@@ -85,7 +85,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, service_config_settings]

docker/services/cinder-scheduler.yaml

@@ -70,7 +70,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, service_config_settings]

docker/services/cinder-volume.yaml

@@ -101,7 +101,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, service_config_settings]

docker/services/congress.yaml

@@ -67,7 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CongressBase, role_data, config_settings]
-      logging_source: {get_attr: [CongressBase, role_data, logging_source]}
       service_config_settings: {get_attr: [CongressBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/database/mongodb.yaml

@@ -70,7 +70,6 @@ outputs:
         map_merge:
           - get_attr: [MongodbPuppetBase, role_data, config_settings]
           - mongodb::server::fork: false
-      logging_source: {get_attr: [MongodbPuppetBase, role_data, logging_source]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: mongodb

docker/services/database/mysql.yaml

@@ -90,7 +90,6 @@ 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]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: mysql

docker/services/database/redis.yaml

@@ -68,7 +68,6 @@ outputs:
           - redis::daemonize: false
             tripleo::stunnel::manage_service: false
             tripleo::stunnel::foreground: 'yes'
-      logging_source: {get_attr: [RedisBase, role_data, logging_source]}
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-api.yaml

@@ -102,7 +102,6 @@ outputs:
             - designate_workers_zero
             - {}
             - designate::api::workers: {get_param: DesignateWorkers}
-      logging_source: {get_attr: [DesignateApiBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-central.yaml

@@ -75,7 +75,6 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - get_attr: [DesignateCentralBase, role_data, config_settings]
-      logging_source: {get_attr: [DesignateCentralBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateCentralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-mdns.yaml

@@ -75,7 +75,6 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - get_attr: [DesignateMDNSBase, role_data, config_settings]
-      logging_source: {get_attr: [DesignateMDNSBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateMDNSBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-producer.yaml

@@ -77,7 +77,6 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - get_attr: [DesignateProducerBase, role_data, config_settings]
-      logging_source: {get_attr: [DesignateProducerBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateProducerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-sink.yaml

@@ -77,7 +77,6 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - get_attr: [DesignateSinkBase, role_data, config_settings]
-      logging_source: {get_attr: [DesignateSinkBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateSinkBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/designate-worker.yaml

@@ -80,7 +80,6 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - get_attr: [DesignateWorkerBase, role_data, config_settings]
-      logging_source: {get_attr: [DesignateWorkerBase, role_data, logging_source]}
       service_config_settings: {get_attr: [DesignateWorkerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ec2-api.yaml

@@ -72,7 +72,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [Ec2ApiPuppetBase, role_data, service_config_settings]

docker/services/etcd.yaml

@@ -57,7 +57,6 @@ 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]}
       config_settings:
         map_merge:
           - {get_attr: [EtcdPuppetBase, role_data, config_settings]}

docker/services/glance-api.yaml

@@ -110,7 +110,6 @@ outputs:
           - get_attr: [GlanceApiPuppetBase, role_data, config_settings]
           - get_attr: [GlanceLogging, config_settings]
           - glance::api::sync_db: false
-      logging_source: {get_attr: [GlanceApiPuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]

docker/services/gnocchi-api.yaml

@@ -93,7 +93,6 @@ outputs:
         map_merge:
           - get_attr: [GnocchiApiPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]

docker/services/gnocchi-metricd.yaml

@@ -78,7 +78,6 @@ 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]}
       service_config_settings: {get_attr: [GnocchiMetricdBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/gnocchi-statsd.yaml

@@ -78,7 +78,6 @@ 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]}
       service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/haproxy.yaml

@@ -138,7 +138,6 @@ 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]}
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/heat-api-cfn.yaml

@@ -78,7 +78,6 @@ outputs:
           - get_attr: [HeatBase, role_data, config_settings]
           - get_attr: [HeatApiCfnLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, service_config_settings]

docker/services/heat-api.yaml

@@ -86,7 +86,6 @@ outputs:
           - get_attr: [HeatBase, role_data, config_settings]
           - get_attr: [HeatApiLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, service_config_settings]

docker/services/heat-engine.yaml

@@ -80,7 +80,6 @@ outputs:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, service_config_settings]

docker/services/horizon.yaml

@@ -68,7 +68,6 @@ outputs:
         map_merge:
           - get_attr: [HorizonBase, role_data, config_settings]
           - horizon::secure_cookies: false
-      logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
       service_config_settings: {get_attr: [HorizonBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ironic-api.yaml

@@ -68,7 +68,6 @@ outputs:
         map_merge:
           - get_attr: [IronicApiBase, role_data, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [IronicApiBase, role_data, logging_source]}
       service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ironic-conductor.yaml

@@ -83,7 +83,6 @@ 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]}
       service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/iscsid.yaml

@@ -57,7 +57,6 @@ 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]}
       service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/keepalived.yaml

@@ -65,7 +65,6 @@ outputs:
         map_merge:
           - get_attr: [KeepalivedBase, role_data, config_settings]
           - tripleo::keepalived:custom_vrrp_script: 'test -S /var/lib/haproxy/stats && echo "show info" | socat /var/lib/haproxy/stats stdio'
-      logging_source: {get_attr: [KeepalivedBase, role_data, logging_source]}
       service_config_settings: {get_attr: [KeepalivedBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/keystone.yaml

@@ -94,7 +94,6 @@ outputs:
           - get_attr: [KeystoneBase, role_data, config_settings]
           - get_attr: [KeystoneLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [KeystoneBase, role_data, service_config_settings]

docker/services/manila-api.yaml

@@ -59,7 +59,6 @@ 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]}
       service_config_settings: {get_attr: [ManilaApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:

docker/services/manila-scheduler.yaml

@@ -59,7 +59,6 @@ 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]}
       service_config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:

docker/services/manila-share.yaml

@@ -76,7 +76,6 @@ 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]}
       service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/memcached.yaml

@@ -61,7 +61,6 @@ outputs:
         map_merge:
           - {get_attr: [MemcachedBase, role_data, config_settings]}
           - memcached::logstdout: true
-      logging_source: {get_attr: [MemcachedBase, role_data, logging_source]}
       service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/messaging/notify-rabbitmq.yaml

@@ -83,7 +83,6 @@ 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]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/messaging/rpc-rabbitmq.yaml

@@ -83,7 +83,6 @@ 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]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/metrics/collectd.yaml

@@ -66,7 +66,6 @@ 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]}
       service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/mistral-api.yaml

@@ -67,7 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralApiBase, role_data, config_settings]
-      logging_source: {get_attr: [MistralApiBase, role_data, logging_source]}
       service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/mistral-engine.yaml

@@ -68,7 +68,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
-      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/mistral-event-engine.yaml

@@ -68,7 +68,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
-      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/mistral-executor.yaml

@@ -76,7 +76,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
-      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/neutron-api.yaml

@@ -89,7 +89,6 @@ 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]}
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

docker/services/neutron-dhcp.yaml

@@ -108,7 +108,6 @@ outputs:
             tripleo::profile::base::neutron::dhcp_agent_wrappers::enable_haproxy_wrapper: {get_param: NeutronEnableHaproxyDockerWrapper}
             tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/dhcp_haproxy_wrapper'
             tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: DockerNeutronDHCPImage}
-      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, service_config_settings]

docker/services/neutron-l3.yaml

@@ -117,7 +117,6 @@ outputs:
             tripleo::profile::base::neutron::l3_agent_wrappers::radvd_process_wrapper: '/var/lib/neutron/radvd_wrapper'
             tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: DockerNeutronL3AgentImage}
 
-      logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NeutronL3Base, role_data, service_config_settings]

docker/services/neutron-metadata.yaml

@@ -71,7 +71,6 @@ outputs:
         map_merge:
           - get_attr: [NeutronMetadataBase, role_data, config_settings]
           - get_attr: [NeutronLogging, config_settings]
-      logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NeutronMetadataBase, role_data, service_config_settings]

docker/services/neutron-ovs-agent.yaml

@@ -79,7 +79,6 @@ outputs:
         map_merge:
           - get_attr: [NeutronOvsAgentBase, role_data, config_settings]
           - get_attr: [NeutronLogging, config_settings]
-      logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NeutronOvsAgentBase, role_data, service_config_settings]

docker/services/neutron-ovs-dpdk-agent.yaml

@@ -75,8 +75,6 @@ outputs:
           - get_attr: [NeutronLogging, config_settings]
       service_config_settings:
         get_attr: [NeutronOvsDpdkAgentBase, role_data, service_config_settings]
-      logging_source:
-        get_attr: [NeutronOvsAgentDockerBase, role_data, logging_source]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2

docker/services/neutron-plugin-ml2-ansible.yaml

@@ -55,7 +55,6 @@ outputs:
     value:
       service_name: {get_attr: [NeutronML2AnsibleBase, role_data, service_name]}
       config_settings: {get_attr: [NeutronML2AnsibleBase, role_data, config_settings]}
-      logging_source: {get_attr: [NeutronML2AnsibleBase, role_data, logging_source]}
       service_config_settings: {get_attr: [NeutronML2AnsibleBase, role_data, service_config_settings]}
       metadata_settings:
         get_attr: [NeutronML2AnsibleBase, role_data, metadata_settings]

docker/services/neutron-plugin-ml2-cisco-vts.yaml

@@ -50,7 +50,6 @@ outputs:
     value:
       service_name: {get_attr: [NeutronMl2VtsBase, role_data, service_name]}
       config_settings: {get_attr: [NeutronMl2VtsBase, role_data, config_settings]}
-      logging_source: {get_attr: [NeutronMl2VtsBase, role_data, logging_source]}
       service_config_settings: {get_attr: [NeutronMl2VtsBase, role_data, service_config_settings]}
       metadata_settings:
         get_attr: [NeutronMl2VtsBase, role_data, metadata_settings]

docker/services/neutron-plugin-ml2.yaml

@@ -57,7 +57,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
-      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
       service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]

docker/services/nova-api.yaml

@@ -98,7 +98,6 @@ outputs:
           - get_attr: [NovaApiBase, role_data, config_settings]
           - get_attr: [NovaApiLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [NovaApiBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaApiBase, role_data, service_config_settings]

docker/services/nova-compute.yaml

@@ -132,7 +132,6 @@ outputs:
         map_merge:
           - get_attr: [NovaComputeBase, role_data, config_settings]
           - get_attr: [NovaLogging, config_settings]
-      logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaComputeBase, role_data, service_config_settings]

docker/services/nova-conductor.yaml

@@ -84,7 +84,6 @@ outputs:
         map_merge:
           - {get_attr: [NovaConductorBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
-      logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaConductorBase, role_data, service_config_settings]

docker/services/nova-consoleauth.yaml

@@ -79,7 +79,6 @@ outputs:
         map_merge:
           - {get_attr: [NovaConsoleauthPuppetBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
-      logging_source: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaConsoleauthPuppetBase, role_data, service_config_settings]

docker/services/nova-ironic.yaml

@@ -76,7 +76,6 @@ outputs:
       service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
       cellv2_discovery: true
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
-      logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config,nova_paste_api_ini

docker/services/nova-libvirt.yaml

@@ -210,7 +210,6 @@ outputs:
           - get_attr: [NovaLibvirtLogging, 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]}
       puppet_config:
         config_volume: nova_libvirt
         puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password

docker/services/nova-metadata.yaml

@@ -98,7 +98,6 @@ outputs:
                   extras:
                     toports: 8775
               - {}
-      logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaMetadataBase, role_data, service_config_settings]

docker/services/nova-migration-target.yaml

@@ -106,7 +106,6 @@ 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]}
       puppet_config:
         config_volume: nova_libvirt
         step_config:

docker/services/nova-placement.yaml

@@ -84,7 +84,6 @@ outputs:
           - get_attr: [NovaPlacementBase, role_data, config_settings]
           - get_attr: [NovaPlacementLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaPlacementBase, role_data, service_config_settings]

docker/services/nova-scheduler.yaml

@@ -79,7 +79,6 @@ outputs:
         map_merge:
           - {get_attr: [NovaSchedulerBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
-      logging_source: {get_attr: [NovaSchedulerBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaSchedulerBase, role_data, service_config_settings]

docker/services/nova-vnc-proxy.yaml

@@ -119,7 +119,6 @@ outputs:
         map_merge:
           - {get_attr: [NovaVncProxyPuppetBase, role_data, config_settings]}
           - {get_attr: [NovaLogging, config_settings]}
-      logging_source: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [NovaVncProxyPuppetBase, role_data, service_config_settings]

docker/services/octavia-api.yaml

@@ -74,7 +74,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [OctaviaApiPuppetBase, role_data, service_config_settings]

docker/services/octavia-health-manager.yaml

@@ -67,7 +67,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]

docker/services/octavia-housekeeping.yaml

@@ -63,7 +63,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]

docker/services/octavia-worker.yaml

@@ -67,7 +67,6 @@ 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]}
       service_config_settings:
         map_merge:
           - get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]

docker/services/opendaylight-api.yaml

@@ -87,7 +87,6 @@ outputs:
             - internal_tls_enabled
             - tripleo::certmonger::opendaylight::postsave_cmd: "true" # TODO: restart the odl container here
             - {}
-      logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: opendaylight

docker/services/ovn-controller.yaml

@@ -60,7 +60,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OvnControllerBase, role_data, config_settings]
-      logging_source: {get_attr: [OvnControllerBase, role_data, logging_source]}
       service_config_settings: {get_attr: [OvnControllerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/ovn-dbs.yaml

@@ -63,7 +63,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OVNDbsBase, role_data, config_settings]
-      logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
       # BEGIN DOCKER SETTINGS
       # puppet_config is not required for this service since we configure
       # the NB and SB DB servers to listen on the proper IP address/port

docker/services/ovn-metadata.yaml

@@ -81,7 +81,6 @@ outputs:
           - tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::enable_haproxy_wrapper: {get_param: OVNEnableHaproxyDockerWrapper}
             tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/ovn_metadata_haproxy_wrapper'
             tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::haproxy_image: {get_param: DockerOvnMetadataImage}
-      logging_source: {get_attr: [OVNMetadataBase, role_data, logging_source]}
       puppet_config:
         puppet_tags: neutron_config,ovn_metadata_agent_config
         config_volume: neutron

docker/services/pacemaker/cinder-backup.yaml

@@ -115,7 +115,6 @@ outputs:
             tripleo::profile::pacemaker::cinder::backup_bundle::docker_environment: {get_attr: [CinderCommon, cinder_backup_environment]}
             cinder::backup::manage_service: false
             cinder::backup::enabled: false
-      logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBackupBase, role_data, service_config_settings]

docker/services/pacemaker/cinder-volume.yaml

@@ -111,7 +111,6 @@ outputs:
             cinder::volume::manage_service: false
             cinder::volume::enabled: false
             cinder::backend_host: hostgroup
-      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, service_config_settings]

docker/services/pacemaker/clustercheck.yaml

@@ -63,7 +63,6 @@ outputs:
     value:
       service_name: clustercheck
       config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]}
-      logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: clustercheck

docker/services/pacemaker/database/mysql.yaml

@@ -125,7 +125,6 @@ outputs:
               tripleo::profile::pacemaker::database::mysql_bundle::ca_file:
                 get_param: InternalTLSCAFile
             - {}
-      logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: mysql

docker/services/pacemaker/database/redis.yaml

@@ -130,7 +130,6 @@ outputs:
                 - '::1'
                 - '127.0.0.1'
             - {}
-      logging_source: {get_attr: [RedisBase, role_data, logging_source]}
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/haproxy.yaml

@@ -157,7 +157,6 @@ outputs:
                       data: {get_param: DockerHAProxyImage}
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
-      logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/manila-share.yaml

@@ -96,7 +96,6 @@ outputs:
             manila::share::manage_service: false
             manila::share::enabled: false
             manila::host: hostgroup
-      logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
       service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/notify-rabbitmq.yaml

@@ -99,7 +99,6 @@ outputs:
                   - 4369
                   - 5672
                   - 25672
-      logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/ovn-dbs.yaml

@@ -97,7 +97,6 @@ outputs:
                   - 'pcmklatest'
           - 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]}
       service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/rabbitmq.yaml

@@ -98,7 +98,6 @@ outputs:
                   - 4369
                   - 5672
                   - 25672
-      logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/rpc-rabbitmq.yaml

@@ -99,7 +99,6 @@ outputs:
                   - 4369
                   - 5672
                   - 25672
-      logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/panko-api.yaml

@@ -77,7 +77,6 @@ outputs:
           - get_attr: [PankoApiPuppetBase, role_data, config_settings]
           - get_attr: [PankoApiLogging, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
       service_config_settings: {get_attr: [PankoApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:

docker/services/rabbitmq.yaml

@@ -82,7 +82,6 @@ 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]}
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/sahara-api.yaml

@@ -71,7 +71,6 @@ outputs:
         map_merge:
           - get_attr: [SaharaApiPuppetBase, role_data, config_settings]
           - sahara::sync_db: false
-      logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]

docker/services/sahara-engine.yaml

@@ -71,7 +71,6 @@ outputs:
         map_merge:
           - get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
           - sahara::sync_db: false
-      logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
       service_config_settings:
         map_merge:
           - get_attr: [SaharaEnginePuppetBase, role_data, service_config_settings]

docker/services/swift-proxy.yaml

@@ -80,7 +80,6 @@ outputs:
     value:
       service_name: {get_attr: [SwiftProxyBase, role_data, service_name]}
       config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
-      logging_source: {get_attr: [SwiftProxyBase, role_data, logging_source]}
       service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/swift-ringbuilder.yaml

@@ -91,7 +91,6 @@ 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]}
       service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/swift-storage.yaml

@@ -83,7 +83,6 @@ 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]}
       service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/tacker.yaml

@@ -63,7 +63,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [TackerBase, role_data, config_settings]
-      logging_source: {get_attr: [TackerBase, role_data, logging_source]}
       service_config_settings: {get_attr: [TackerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/tripleo-ui.yaml

@@ -76,7 +76,6 @@ outputs:
         map_merge:
           - get_attr: [TripleoUIPuppetBase, role_data, config_settings]
           - apache::default_vhost: false
-      logging_source: {get_attr: [TripleoUIPuppetBase, role_data, logging_source]}
       service_config_settings: {get_attr: [TripleoUIPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/zaqar.yaml

@@ -77,7 +77,6 @@ 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]}
       service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config: