Fix service config files having wrong map_merge format

[Saravanan KR]

service config files neutron-ovs-dpdk-agent.yaml and neutron-api.yaml have a wrong format of the map_merge.

Existing:
config_settings:
  map_merge:
    - get_attr: [NeutronOvsAgent, role_data, config_settings]
      neutron::agents::ml2::ovs::enable_dpdk: true
      neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
      neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}

Expected:
config_settings:
  map_merge:
    - get_attr: [NeutronOvsAgent, role_data, config_settings]
    - neutron::agents::ml2::ovs::enable_dpdk: true
      neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
      neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}

Need to add hypen for the starting of second map.

[Saravanan KR (skramaja)]

Patch - https://review.openstack.org/#/c/366674/

[Steven Hardy (shardy)]

Related heat bug: https://bugs.launchpad.net/heat/+bug/1620985

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/366674
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=85df73d23915e29fbffed479e128c30c951b76f0
Submitter: Jenkins
Branch: master

commit 85df73d23915e29fbffed479e128c30c951b76f0
Author: Saravanan KR <email address hidden>
Date: Wed Sep 7 16:19:51 2016 +0530

    Fix service config files having wrong map_merge format

    map_merge in heat templates should start with hypen for
    each map group, few templates are missing the hypen for the
    second map group, which is added in this patch

    Closes-Bug: #1621008
    Change-Id: I307fdd7afc374cce46d6e378594f1b688b9fd4f6