Pacemaker-cinder-volume & pacemaker-cinder-backup log path fix

As can be seen in the gate [1][2], the path for the
services are not set correctly.

Added the inheritance service_config_settings for
puppet/services/pacemaker/cinder-volume.yaml &
puppet/services/pacemaker/cinder-backup.yaml

Overwrite the log path on the
docker/services/pacemaker/cinder-volume.yaml &
docker/services/pacemaker/cinder-backup.yaml

[1]http://logs.openstack.org/36/594836/1/check/tripleo-ci-centos-7-scenario002-multinode-oooq-container/427de6c/logs/subnode-2/var/log/config-data/fluentd/etc/fluentd/config.d/100-openstack-cinder_backup.conf.txt.gz
[2]http://logs.openstack.org/36/594836/1/check/tripleo-ci-centos-7-scenario002-multinode-oooq-container/427de6c/logs/subnode-2/var/log/config-data/fluentd/etc/fluentd/config.d/100-openstack-cinder_volume.conf.txt.gz

Depends-On: If253da4f0f89221dc6ddacc280c984079c6a3c7f
Change-Id: Iaf2ab01a501e8f5ef15ac3618eac5df67fabcf5c

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}
@@ -111,7 +116,14 @@ outputs:
             cinder::backup::manage_service: false
             cinder::backup::enabled: false
       logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
-      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}
@@ -107,7 +112,14 @@ outputs:
             cinder::volume::enabled: false
             cinder::backend_host: hostgroup
       logging_source: {get_attr: [CinderBase, role_data, logging_source]}
-      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: