Description of problem:
Follow-up of cherry-picked fix for this bz: https://bugzilla.redhat.com/show_bug.cgi?id=1414271

There are still remainings of the same code in /usr/share/openstack-tripleo-heat-templates/puppet/services/gnocchi-base.yaml:

  MetricProcessingDelay:
    default: 30
    description: Delay between processing metrics.

        gnocchi::storage::metric_processing_delay: {get_param: MetricProcessingDelay}

And accordingly, we now see metric_processing_delay twice in the same /etc/gnocchi/gnocchi.conf: in metricd section and in oslo_messaging section, and it definitely doesn't belong to oslo_messageing

We need to clean it from there.

Version-Release number of selected component (if applicable):
openstack-gnocchi-common-4.0.3-2.el7ost.noarch
puppet-gnocchi-11.3.0-2.el7ost.noarch
openstack-gnocchi-metricd-4.0.3-2.el7ost.noarch
python-gnocchiclient-3.3.1-1.el7ost.noarch
openstack-gnocchi-api-4.0.3-2.el7ost.noarch
openstack-gnocchi-indexer-sqlalchemy-4.0.3-2.el7ost.noarch
openstack-gnocchi-statsd-4.0.3-2.el7ost.noarch
python-gnocchi-4.0.3-2.el7ost.noarch


How reproducible:
100%

Steps to Reproduce:
1. Deploy overcloud with 
custom_templates: 
    parameter_defaults:
        MetricProcessingDelay: 15

2. Go to controller, observe gnocchi.conf:
sudo docker exec -ti gnocchi_api vi /etc/gnocchi/gnocchi.conf


Actual results:
metric_processing_delay appears twice in the conf file

Expected results:
It's supposed to appear only in metricd section

Additional info: