Merge "Pacemaker-cinder-volume & pacemaker-cinder-backup log path fix" into stable/rocky

docker/services/pacemaker/cinder-backup.yaml

@@ -63,6 +63,11 @@ parameters:
     description: >
       Setting this to a unique value will re-run any deployment tasks which
       perform configuration on a Heat stack-update.
+  DockerCinderBackupLoggingSource:
+    type: json
+    default:
+      tag: openstack.cinder.backup
+      path: /var/log/containers/cinder/cinder-backup.log
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -112,7 +117,14 @@ outputs:
             cinder::backup::enabled: false
       logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
       logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]}
-      service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
+      service_config_settings:
+        map_merge:
+          - get_attr: [CinderBackupBase, role_data, service_config_settings]
+          - fluentd:
+              tripleo_fluentd_groups_cinder_backup:
+                - cinder
+              tripleo_fluentd_sources_cinder_backup:
+                - {get_param: DockerCinderBackupLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

docker/services/pacemaker/cinder-volume.yaml

@@ -60,6 +60,11 @@ parameters:
     description: >
       Setting this to a unique value will re-run any deployment tasks which
       perform configuration on a Heat stack-update.
+  CinderVolumeLoggingSource:
+    type: json
+    default:
+      tag: openstack.cinder.volume
+      path: /var/log/containers/cinder/cinder-volume.log
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -108,7 +113,14 @@ outputs:
             cinder::backend_host: hostgroup
       logging_source: {get_attr: [CinderBase, role_data, logging_source]}
       logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
-      service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
+      service_config_settings:
+        map_merge:
+          - get_attr: [CinderBase, role_data, service_config_settings]
+          - fluentd:
+              tripleo_fluentd_groups_cinder_volume:
+                - cinder
+              tripleo_fluentd_sources_cinder_volume:
+                - {get_param: CinderVolumeLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

puppet/services/pacemaker/cinder-backup.yaml

@@ -69,6 +69,7 @@ outputs:
           - get_attr: [CinderBackupBase, role_data, config_settings]
           - cinder::backup::manage_service: false
             cinder::backup::enabled: false
+      service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
       step_config:
         list_join:
           - "\n"

puppet/services/pacemaker/cinder-volume.yaml

@@ -55,6 +55,7 @@ outputs:
           - cinder::volume::manage_service: false
             cinder::volume::enabled: false
             cinder::backend_host: hostgroup
+      service_config_settings: {get_attr: [CinderVolumeBase, role_data, service_config_settings]}
       step_config:
         include ::tripleo::profile::pacemaker::cinder::volume
       upgrade_tasks: