Merge "Remove fluentd composable service"

deployment/nova/nova-api-container-puppet.yaml

@@ -14,7 +14,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.api
-      path: /var/log/containers/nova/nova-api.log
+      file: /var/log/containers/nova/nova-api.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -212,10 +212,8 @@ outputs:
             - {}
 
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_api:
-            - nova
-          tripleo_fluentd_sources_nova_api:
+        rsyslog:
+          tripleo_logging_sources_nova_api:
             - {get_param: NovaApiLoggingSource}
         mysql:
           map_merge:

deployment/nova/nova-compute-container-puppet.yaml

@@ -18,7 +18,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.compute
-      path: /var/log/containers/nova/nova-compute.log
+      file: /var/log/containers/nova/nova-compute.log
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -560,10 +560,8 @@ outputs:
               - '1.0'
               - {get_attr: [RoleParametersValue, value, 'nova::ram_allocation_ratio']}
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_compute:
-            - nova
-          tripleo_fluentd_sources_nova_compute:
+        rsyslog:
+          tripleo_logging_sources_nova_compute:
             - {get_param: NovaComputeLoggingSource}
         collectd:
           tripleo.collectd.plugins.nova_compute:

deployment/nova/nova-conductor-container-puppet.yaml

@@ -14,7 +14,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.conductor
-      path: /var/log/containers/nova/nova-conductor.log
+      file: /var/log/containers/nova/nova-conductor.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -115,10 +115,8 @@ outputs:
             - {}
             - nova::conductor::workers: {get_param: NovaWorkers}
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_conductor:
-            - nova
-          tripleo_fluentd_sources_nova_conductor:
+        rsyslog:
+          tripleo_logging_sources_nova_conductor:
             - {get_param: NovaConductorLoggingSource}
         mysql:
           map_merge:

deployment/nova/nova-metadata-container-puppet.yaml

@@ -14,7 +14,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.api.metadata
-      path: /var/log/containers/nova/nova-api-metadata.log
+      file: /var/log/containers/nova/nova-api-metadata.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -169,10 +169,8 @@ outputs:
             - nova::metadata::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
             - {}
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_metadata:
-            - nova
-          tripleo_fluentd_sources_nova_metadata:
+        rsyslog:
+          tripleo_logging_sources_nova_metadata:
             - {get_param: NovaMetadataLoggingSource}
         keystone:
           nova::keystone::auth::tenant: 'service'

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -14,7 +14,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.scheduler
-      path: /var/log/containers/nova/nova-scheduler.log
+      file: /var/log/containers/nova/nova-scheduler.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -139,10 +139,8 @@ outputs:
             - {}
             - nova::scheduler::workers: {get_param: NovaSchedulerWorkers}
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_scheduler:
-            - nova
-          tripleo_fluentd_sources_nova_scheduler:
+        rsyslog:
+          tripleo_logging_sources_nova_scheduler:
             - {get_param: NovaSchedulerLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -14,7 +14,7 @@ parameters:
     type: json
     default:
       tag: openstack.nova.vncproxy
-      path: /var/log/containers/nova/nova-vncproxy.log
+      file: /var/log/containers/nova/nova-vncproxy.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -200,10 +200,8 @@ outputs:
                         NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
               - {}
       service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_nova_vnc_proxy:
-            - nova
-          tripleo_fluentd_sources_nova_vnc_proxy:
+        rsyslog:
+          tripleo_logging_sources_nova_vnc_proxy:
             - {get_param: NovaVncproxyLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config: