diff --git a/common/services.yaml b/common/services.yaml
index fea728145b..bc861814f1 100644
--- a/common/services.yaml
+++ b/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), {})
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 079646e84a..789d53bee9 100644
--- a/docker/services/aodh-api.yaml
+++ b/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:
diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index 6a59cceb9c..366d70f4ad 100644
--- a/docker/services/aodh-evaluator.yaml
+++ b/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:
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 5468719954..3212e884ff 100644
--- a/docker/services/aodh-listener.yaml
+++ b/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:
diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index e49c75d2e9..1faae608bb 100644
--- a/docker/services/aodh-notifier.yaml
+++ b/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:
diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml
index f74cc42732..e63c3cbc05 100644
--- a/docker/services/barbican-api.yaml
+++ b/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:
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index 317d9ee46e..6c623eaf4a 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/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]
diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 160488bc56..a6798d18e2 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/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:
diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index 007ba01844..8e17690808 100644
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/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]
diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index b7caf56b51..47f8a7a0c1 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/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]
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index f84ce7821b..9d1e9507c5 100644
--- a/docker/services/cinder-api.yaml
+++ b/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]
diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml
index 49ea5fcf20..c57cc5a99d 100644
--- a/docker/services/cinder-backup.yaml
+++ b/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]
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index f2a8d3ee4e..066e8704f7 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/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]
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index a24733e4cf..39b50f1243 100644
--- a/docker/services/cinder-volume.yaml
+++ b/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]
diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index 982e2dcebf..de43baa0fa 100644
--- a/docker/services/congress.yaml
+++ b/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:
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 276ec79542..712ff0ca57 100644
--- a/docker/services/database/mongodb.yaml
+++ b/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
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 9dee7e5b89..22886b05c2 100644
--- a/docker/services/database/mysql.yaml
+++ b/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
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index bb94c38d3f..83ecceec09 100644
--- a/docker/services/database/redis.yaml
+++ b/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:
diff --git a/docker/services/designate-api.yaml b/docker/services/designate-api.yaml
index 9eafedbdf2..5b708032b9 100644
--- a/docker/services/designate-api.yaml
+++ b/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:
diff --git a/docker/services/designate-central.yaml b/docker/services/designate-central.yaml
index 6d378b39f0..8d647b8e37 100644
--- a/docker/services/designate-central.yaml
+++ b/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:
diff --git a/docker/services/designate-mdns.yaml b/docker/services/designate-mdns.yaml
index 808ec998dd..0c91490175 100644
--- a/docker/services/designate-mdns.yaml
+++ b/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:
diff --git a/docker/services/designate-producer.yaml b/docker/services/designate-producer.yaml
index 40e3a0facf..a7d09ea6f2 100644
--- a/docker/services/designate-producer.yaml
+++ b/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:
diff --git a/docker/services/designate-sink.yaml b/docker/services/designate-sink.yaml
index 8ab5d16298..51e47ea7bd 100644
--- a/docker/services/designate-sink.yaml
+++ b/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:
diff --git a/docker/services/designate-worker.yaml b/docker/services/designate-worker.yaml
index f6e1b09526..f4b07e9eb1 100644
--- a/docker/services/designate-worker.yaml
+++ b/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:
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index bf39c5a9e2..81b4229e13 100644
--- a/docker/services/ec2-api.yaml
+++ b/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]
diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 8b4f8a12b3..4cdb239bd6 100644
--- a/docker/services/etcd.yaml
+++ b/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]}
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 996aa2c92f..24130950fb 100644
--- a/docker/services/glance-api.yaml
+++ b/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]
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index a91b38b705..cb160c7e33 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/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]
diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 336fb7923b..b822891b3c 100644
--- a/docker/services/gnocchi-metricd.yaml
+++ b/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:
diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index bca8d825cd..2156378d6e 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/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:
diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index f20a5488b6..56abe74ff6 100644
--- a/docker/services/haproxy.yaml
+++ b/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:
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 47b1cac798..bda4ed8cf6 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/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]
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 3c146faaef..fe1fda8880 100644
--- a/docker/services/heat-api.yaml
+++ b/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]
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index fdc1123e62..24447a77f7 100644
--- a/docker/services/heat-engine.yaml
+++ b/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]
diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index b14340beec..1f174a224e 100644
--- a/docker/services/horizon.yaml
+++ b/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:
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 7cf09a9d44..f69ff705a1 100644
--- a/docker/services/ironic-api.yaml
+++ b/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:
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 24becefcf7..3891c35a99 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/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:
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index 706754e110..d21f2f4816 100644
--- a/docker/services/iscsid.yaml
+++ b/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:
diff --git a/docker/services/keepalived.yaml b/docker/services/keepalived.yaml
index efb083b58a..c8edb98c08 100644
--- a/docker/services/keepalived.yaml
+++ b/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:
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 211915b4e4..28e93b0563 100644
--- a/docker/services/keystone.yaml
+++ b/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]
diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index db88b407b9..c25b69f8f4 100644
--- a/docker/services/manila-api.yaml
+++ b/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:
diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml
index 579cb8b268..0b5fe7003c 100644
--- a/docker/services/manila-scheduler.yaml
+++ b/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:
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 759ab3068d..3529f90008 100644
--- a/docker/services/manila-share.yaml
+++ b/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:
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index ffdcd790dc..f19a297794 100644
--- a/docker/services/memcached.yaml
+++ b/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:
diff --git a/docker/services/messaging/notify-rabbitmq.yaml b/docker/services/messaging/notify-rabbitmq.yaml
index 40291597f5..845ff7c43c 100644
--- a/docker/services/messaging/notify-rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/messaging/rpc-rabbitmq.yaml b/docker/services/messaging/rpc-rabbitmq.yaml
index ca2b61cee7..33c1781b20 100644
--- a/docker/services/messaging/rpc-rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/metrics/collectd.yaml b/docker/services/metrics/collectd.yaml
index 222795f8ef..e9637e57c3 100644
--- a/docker/services/metrics/collectd.yaml
+++ b/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:
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 75ca94915c..af2841d698 100644
--- a/docker/services/mistral-api.yaml
+++ b/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:
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index 32601d8624..9a053ad364 100644
--- a/docker/services/mistral-engine.yaml
+++ b/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:
diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml
index 04103ce99c..ef89d0ac95 100644
--- a/docker/services/mistral-event-engine.yaml
+++ b/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:
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index eead63b4ca..3a10191691 100644
--- a/docker/services/mistral-executor.yaml
+++ b/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:
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index 1011bbba6d..d1a7f4ad5c 100644
--- a/docker/services/neutron-api.yaml
+++ b/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]
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 1abea43c4e..d24350c2d7 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/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]
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 8e3b0d9fdc..bb5eb80653 100644
--- a/docker/services/neutron-l3.yaml
+++ b/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]
diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml
index ac38e6b062..68fd0f6d65 100644
--- a/docker/services/neutron-metadata.yaml
+++ b/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]
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index b8d4daba3c..d6af8bbc01 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/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]
diff --git a/docker/services/neutron-ovs-dpdk-agent.yaml b/docker/services/neutron-ovs-dpdk-agent.yaml
index e747f0b4a7..ea5cfb2668 100644
--- a/docker/services/neutron-ovs-dpdk-agent.yaml
+++ b/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
diff --git a/docker/services/neutron-plugin-ml2-ansible.yaml b/docker/services/neutron-plugin-ml2-ansible.yaml
index dca191584b..4e96235611 100644
--- a/docker/services/neutron-plugin-ml2-ansible.yaml
+++ b/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]
diff --git a/docker/services/neutron-plugin-ml2-cisco-vts.yaml b/docker/services/neutron-plugin-ml2-cisco-vts.yaml
index 1b2f6f739e..4c8a2bcac0 100644
--- a/docker/services/neutron-plugin-ml2-cisco-vts.yaml
+++ b/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]
diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index ea9422e688..e7c14c8cc9 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/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]
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 84abc41a09..02ec0bd658 100644
--- a/docker/services/nova-api.yaml
+++ b/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]
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index d60ed712f5..b4192701be 100644
--- a/docker/services/nova-compute.yaml
+++ b/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]
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 52d7e2c53d..7cd16595f1 100644
--- a/docker/services/nova-conductor.yaml
+++ b/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]
diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml
index b969bdaa7f..a3c4e51e75 100644
--- a/docker/services/nova-consoleauth.yaml
+++ b/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]
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 23c385c616..9a7f99645e 100644
--- a/docker/services/nova-ironic.yaml
+++ b/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
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 39a01e866a..0553e1cfe4 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/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
diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index f536a18a29..bf3858795d 100644
--- a/docker/services/nova-metadata.yaml
+++ b/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]
diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index 252ad7cd2f..7cf63a0682 100644
--- a/docker/services/nova-migration-target.yaml
+++ b/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:
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 1782154253..ee32b2e37b 100644
--- a/docker/services/nova-placement.yaml
+++ b/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]
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index 33ca9db410..20643653fd 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/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]
diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml
index 779e9b3871..e89551c9ca 100644
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/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]
diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index 4f4345cc5b..8b49560982 100644
--- a/docker/services/octavia-api.yaml
+++ b/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]
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index e86c21237c..a1e34bca61 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/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]
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index b4654c0870..1e0afb9235 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/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]
diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index 80fe94a81e..47b3d8da67 100644
--- a/docker/services/octavia-worker.yaml
+++ b/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]
diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index fad72920f1..f3c236c4e2 100644
--- a/docker/services/opendaylight-api.yaml
+++ b/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
diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml
index 9a7a749862..701b83c58f 100644
--- a/docker/services/ovn-controller.yaml
+++ b/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:
diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml
index 1ae303ed10..2685b1b0b2 100644
--- a/docker/services/ovn-dbs.yaml
+++ b/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
diff --git a/docker/services/ovn-metadata.yaml b/docker/services/ovn-metadata.yaml
index 97ff348a75..9bf2ab7a61 100644
--- a/docker/services/ovn-metadata.yaml
+++ b/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
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index da38de0fa7..a19767d340 100644
--- a/docker/services/pacemaker/cinder-backup.yaml
+++ b/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]
diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml
index a0cea18120..d6e8ed9ae4 100644
--- a/docker/services/pacemaker/cinder-volume.yaml
+++ b/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]
diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index 6475224442..2a189c62bf 100644
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/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
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 20c3a618a7..9e7d02d83e 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/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
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index c06439ceeb..62bf36d1af 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 649b35c0a6..54f9b093cd 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index 829071434d..11ccb8b3d3 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/notify-rabbitmq.yaml b/docker/services/pacemaker/notify-rabbitmq.yaml
index 4efd53f972..387bce80b6 100644
--- a/docker/services/pacemaker/notify-rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index daaeb9d93a..203eb8a711 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index f8a1997628..c736252b06 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/pacemaker/rpc-rabbitmq.yaml b/docker/services/pacemaker/rpc-rabbitmq.yaml
index b2b3310ce0..a2b3311af3 100644
--- a/docker/services/pacemaker/rpc-rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 809dbddfae..bf8ed237d2 100644
--- a/docker/services/panko-api.yaml
+++ b/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:
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 41ac3a0001..3f493f4b18 100644
--- a/docker/services/rabbitmq.yaml
+++ b/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:
diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index 9c2ce6a3eb..50462bd023 100644
--- a/docker/services/sahara-api.yaml
+++ b/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]
diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index f684a438bd..bece1dbc63 100644
--- a/docker/services/sahara-engine.yaml
+++ b/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]
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index fbd5d012b5..736e0fdfa4 100644
--- a/docker/services/swift-proxy.yaml
+++ b/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:
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 658eea08ab..47a9c7032c 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/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:
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 7cb82218e4..40007d3622 100644
--- a/docker/services/swift-storage.yaml
+++ b/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:
diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 5729c10ed9..0a2d8ed389 100644
--- a/docker/services/tacker.yaml
+++ b/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:
diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml
index 2374f8b2f6..47afa84224 100644
--- a/docker/services/tripleo-ui.yaml
+++ b/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:
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 47161895ce..9f95c4a6c8 100644
--- a/docker/services/zaqar.yaml
+++ b/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:
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 20d66d9737..5aa135feef 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -588,7 +588,6 @@ resources:
           ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
           ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]}
           MonitoringSubscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
-          LoggingSources: {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_sources]}
           ServiceMetadataSettings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]}
           DeploymentServerBlacklistDict: {get_attr: [DeploymentServerBlacklistDict, value]}
           RoleParameters:
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 216caced3a..e59f1ddb18 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -181,9 +181,6 @@ parameters:
       the configuration collection to occur as soon as the collection process
       starts.  This setting is used to prevent the configuration collection
       processes from polling all at the exact same time.
-  LoggingSources:
-    type: json
-    default: []
   UpgradeInitCommand:
     type: string
     description: |
@@ -699,7 +696,6 @@ resources:
               - {get_param: {{role.name}}ExtraConfig}
           extraconfig: {get_param: ExtraConfig}
           {{role.name.lower()}}:
-            tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
             tripleo::clouddomain: {get_param: CloudDomain}
   {%- for network in networks %}
             fqdn_{{network.name_lower}}: {get_attr: [NetHostMap, value, {{network.name_lower}}, fqdn]}
diff --git a/puppet/services/designate-api.yaml b/puppet/services/designate-api.yaml
index 8333f0e7d3..d2bd0cf12f 100644
--- a/puppet/services/designate-api.yaml
+++ b/puppet/services/designate-api.yaml
@@ -76,7 +76,6 @@ outputs:
     value:
       service_name: designate_api
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateApi}
-      logging_source: {get_param: DesignateApiLoggingSource}
       config_settings:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/designate-central.yaml b/puppet/services/designate-central.yaml
index 20bd099550..bd2e8378d6 100644
--- a/puppet/services/designate-central.yaml
+++ b/puppet/services/designate-central.yaml
@@ -69,7 +69,6 @@ outputs:
     value:
       service_name: designate_central
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateCentral}
-      logging_source: {get_param: DesignateCentralLoggingSource}
       config_settings:
         map_merge:
         - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/designate-mdns.yaml b/puppet/services/designate-mdns.yaml
index 60ccafe017..ae7e9968ed 100644
--- a/puppet/services/designate-mdns.yaml
+++ b/puppet/services/designate-mdns.yaml
@@ -66,7 +66,6 @@ outputs:
     value:
       service_name: designate_mdns
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateMiniDNS}
-      logging_source: {get_param: DesignateMiniDNSLoggingSource}
       config_settings:
         map_merge:
         - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/designate-producer.yaml b/puppet/services/designate-producer.yaml
index e277a04749..a8da302524 100644
--- a/puppet/services/designate-producer.yaml
+++ b/puppet/services/designate-producer.yaml
@@ -62,7 +62,6 @@ outputs:
     value:
       service_name: designate_producer
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateProducer}
-      logging_source: {get_param: DesignateProducerLoggingSource}
       config_settings:
         map_merge:
         - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/designate-sink.yaml b/puppet/services/designate-sink.yaml
index 0f075f8fe8..5f0490f23e 100644
--- a/puppet/services/designate-sink.yaml
+++ b/puppet/services/designate-sink.yaml
@@ -62,7 +62,6 @@ outputs:
     value:
       service_name: designate_sink
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateSink}
-      logging_source: {get_param: DesignateSinkLoggingSource}
       config_settings:
         map_merge:
         - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/designate-worker.yaml b/puppet/services/designate-worker.yaml
index 48103bc3e4..3d195c8d85 100644
--- a/puppet/services/designate-worker.yaml
+++ b/puppet/services/designate-worker.yaml
@@ -66,7 +66,6 @@ outputs:
     value:
       service_name: designate_worker
       monitoring_subscription: {get_param: MonitoringSubscriptionDesignateWorker}
-      logging_source: {get_param: DesignateWorkerLoggingSource}
       config_settings:
         map_merge:
         - get_attr: [DesignateBase, role_data, config_settings]
diff --git a/puppet/services/ovn-metadata.yaml b/puppet/services/ovn-metadata.yaml
index 56ff717e83..2e1adc61c3 100644
--- a/puppet/services/ovn-metadata.yaml
+++ b/puppet/services/ovn-metadata.yaml
@@ -102,7 +102,6 @@ outputs:
     value:
       service_name: ovn_metadata
       monitoring_subscription: {get_param: MonitoringSubscriptionOvnMetadata}
-      logging_source: {get_param: OvnMetadataAgentLoggingSource}
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
diff --git a/puppet/services/tripleo-ui.yaml b/puppet/services/tripleo-ui.yaml
index 2e6771bf68..5d60f69778 100644
--- a/puppet/services/tripleo-ui.yaml
+++ b/puppet/services/tripleo-ui.yaml
@@ -66,7 +66,6 @@ outputs:
     description: Role data for the TripleO UI role.
     value:
       service_name: tripleo_ui
-      logging_source: {get_param: TripleoUILoggingSource}
       config_settings:
         map_merge:
           - get_attr: [ApacheServiceBase, role_data, config_settings]
diff --git a/releasenotes/notes/remove-logging-sources-e573f5281798a069.yaml b/releasenotes/notes/remove-logging-sources-e573f5281798a069.yaml
new file mode 100644
index 0000000000..6e2b76a975
--- /dev/null
+++ b/releasenotes/notes/remove-logging-sources-e573f5281798a069.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    All references to the logging_source output in the services templates have
+    been removed, since it's been unused for a couple of releases now.
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 3b622f8276..7603cbac88 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -67,7 +67,6 @@ OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
                             'post_update_tasks', 'service_config_settings',
                             'host_prep_tasks', 'metadata_settings',
                             'kolla_config', 'global_config_settings',
-                            'logging_source',
                             'external_deploy_tasks', 'external_post_deploy_tasks',
                             'docker_config_scripts', 'step_config',
                             'monitoring_subscription',