Merge "Designate: Fix missing LoggingSource parameters"

deployment/designate/designate-central-container-puppet.yaml

@@ -14,6 +14,11 @@ parameters:
     type: string
     tags:
       - role_specific
+  DesignateCentralLoggingSource:
+    type: json
+    default:
+      tag: openstack.designate.central
+      file: /var/log/containers/designate/central.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -158,6 +163,9 @@ outputs:
           designate::db::mysql::user: designate
           designate::db::mysql::host: '%'
           designate::db::mysql::dbname: designate
+        rsyslog:
+          tripleo_logging_sources_designate_central:
+            - {get_param: DesignateCentralLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate

deployment/designate/designate-mdns-container-puppet.yaml

@@ -14,6 +14,11 @@ parameters:
     type: string
     tags:
       - role_specific
+  DesignateMdnsLoggingSource:
+    type: json
+    default:
+      tag: openstack.designate.mdns
+      file: /var/log/containers/designate/mdns.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -143,6 +148,9 @@ outputs:
           designate::db::mysql::user: designate
           designate::db::mysql::host: '%'
           designate::db::mysql::dbname: designate
+        rsyslog:
+          tripleo_logging_sources_designate_mdns:
+            - {get_param: DesignateMdnsLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate

deployment/designate/designate-sink-container-puppet.yaml

@@ -14,6 +14,11 @@ parameters:
     type: string
     tags:
       - role_specific
+  DesignateSinkLoggingSource:
+    type: json
+    default:
+      tag: openstack.designate.sink
+      file: /var/log/containers/designate/sink.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -90,7 +95,10 @@ outputs:
             - designate_workers_zero
             - {}
             - designate::sink::workers: {get_param: DesignateWorkers}
-      service_config_settings: {}
+      service_config_settings:
+        rsyslog:
+          tripleo_logging_sources_designate_sink:
+            - {get_param: DesignateSinkLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate