service_config_settings map_merge of 'null' value and map causes the map merge not to happen

[Harald Jensås]

In: deployment/cinder/cinder-volume-pacemaker-puppet.yaml, deployment/cinder/cinder-volume-container-puppet.yaml, deployment/cinder/cinder-scheduler-container-puppet.yaml

      service_config_settings:
        map_merge:
          - get_attr: [CinderBase, role_data, service_config_settings]
          - rsyslog:
              tripleo_logging_sources_cinder_volume:
                - {get_param: CinderVolumeLoggingSource}

:: The CinderBase does not set 'service_config_settings' so it becomes:

        map_merge:
          - null
          - rsyslog:
              tripleo_logging_sources_cinder_volume:
                - {get_param: CinderVolumeLoggingSource}

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

        map_merge:
          - rsyslog:
              tripleo_logging_sources_placement:
                - {get_param: PlacementLoggingSource}

:: Only one entry in the map merge.

The result is that $ROLEServiceChain includes the merged combination of the above.

service_config_settings:
  [ ... snip ... }
  map_merge:
    - null
    - rsyslog:
        tripleo_logging_sources_cinder_api:
          - file: /var/log/containers/cinder/cinder-api.log
            tag: openstack.cinder.api
    - rsyslog:
        tripleo_logging_sources_placement:
          - file: /var/log/containers/httpd/placement_wsgi_error_ssl.log
            tag: openstack.placement

This is incorrect, the 'tripleo_logging_sources_cinder_api' and 'tripleo_logging_sources_placement' should be under service_config_settings['rsyslog'] with all the other tripleo_logging_sources.

[Harald Jensås (harald-jensas)]

Proposed Fix: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/777877

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 14.1.0 release.