Fix logging_sources map_merge issues

Fixes an issue where map_merge was used incorrectly,
trying to merge dict with null and passing a list of
only one map.

This caused the map merge not to happen, and the
$RoleServiceChain output to carry the actual map_merge
in service_config_settings instead of the intended
merged map of rsyslog logging_sources.

Closes-Bug: #1917195
Change-Id: I529f91d5391d24bb5a6af37d3486f6ddf6cabac7

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

@@ -204,11 +204,9 @@ outputs:
             - {}
             - cinder::wsgi::apache::workers: {get_param: CinderWorkers}
       service_config_settings:
-        map_merge:
+        rsyslog:
-          - get_attr: [CinderBase, role_data, service_config_settings]
+          tripleo_logging_sources_cinder_api:
-          - rsyslog:
+            - {get_param: CinderApiLoggingSource}
-              tripleo_logging_sources_cinder_api:
-                - {get_param: CinderApiLoggingSource}
         mysql:
           cinder::db::mysql::password: {get_param: CinderPassword}
           cinder::db::mysql::user: cinder

deployment/cinder/cinder-backup-container-puppet.yaml

@@ -114,11 +114,9 @@ outputs:
             cinder::backup::nfs::backup_share: {get_param: CinderBackupNfsShare}
             cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions}
       service_config_settings:
-        map_merge:
+        rsyslog:
-          - get_attr: [CinderBase, role_data, service_config_settings]
+          tripleo_logging_sources_cinder_backup:
-          - rsyslog:
+            - {get_param: DockerCinderBackupLoggingSource}
-              tripleo_logging_sources_cinder_backup:
-                - {get_param: DockerCinderBackupLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -143,11 +143,7 @@ outputs:
             cinder::backup::manage_service: false
             cinder::backup::enabled: false
       service_config_settings:
-        map_merge:
+          get_attr: [CinderBackupBase, role_data, service_config_settings]
-          - get_attr: [CinderBackupBase, role_data, service_config_settings]
-          - rsyslog:
-              tripleo_logging_sources_cinder_backup:
-                - {get_param: DockerCinderBackupLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

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

@@ -73,11 +73,9 @@ outputs:
           - get_attr: [CinderBase, role_data, config_settings]
           - cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
       service_config_settings:
-        map_merge:
+        rsyslog:
-          - get_attr: [CinderBase, role_data, service_config_settings]
+          tripleo_logging_sources_cinder_scheduler:
-          - rsyslog:
+            - {get_param: CinderSchedulerLoggingSource}
-              tripleo_logging_sources_cinder_scheduler:
-                - {get_param: CinderSchedulerLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

deployment/cinder/cinder-volume-container-puppet.yaml

@@ -280,11 +280,9 @@ outputs:
                     $NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
             - {}
       service_config_settings:
-        map_merge:
+        rsyslog:
-          - get_attr: [CinderBase, role_data, service_config_settings]
+          tripleo_logging_sources_cinder_volume:
-          - rsyslog:
+            - {get_param: CinderVolumeLoggingSource}
-              tripleo_logging_sources_cinder_volume:
-                - {get_param: CinderVolumeLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -131,11 +131,7 @@ outputs:
             cinder::volume::enabled: false
             cinder::backend_host: hostgroup
       service_config_settings:
-        map_merge:
+        get_attr: [CinderBase, role_data, service_config_settings]
-          - get_attr: [CinderBase, role_data, service_config_settings]
-          - rsyslog:
-              tripleo_logging_sources_cinder_volume:
-                - {get_param: CinderVolumeLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder

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

@@ -183,10 +183,9 @@ outputs:
               - {}
               - placement::wsgi::apache::workers: {get_param: PlacementWorkers}
       service_config_settings:
-        map_merge:
+        rsyslog:
-          - rsyslog:
+          tripleo_logging_sources_placement:
-              tripleo_logging_sources_placement:
+            - {get_param: PlacementLoggingSource}
-                - {get_param: PlacementLoggingSource}
         mysql:
           placement::db::mysql::password: {get_param: PlacementPassword}
           placement::db::mysql::user: placement