Cisco ML2 extraconfig template outputs an additional incorrect key into the hiera file

[Sam Betts]

Description
===========

Since os-apply-config changed to the hiera hook here:
https://github.com/openstack/tripleo-heat-templates/commit/c5d10cd9fc94e6557417673190b73867a83cbb7b
the mapped_data key is no longer required and results in an additional
incorrect key being written to the hiera data.

Steps to reproduce
==================

Run a tripleO overcloud deployment with -e /usr/share/openstack-tripleo-heat-templates/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml to configure the Cisco ML2 hiera data.

Then on one of the controller nodes `cat /etc/puppet/hieradata/neutron_cisco_data.json` you can see the hieradata that was generated.

Expected result
===============

{
 "neutron::plugins::ml2::cisco::ucsm::ucsm_ip": "1.2.3.4",
  ...
}

Actual result
=============

{
  "mapped_data": {
      "neutron::plugins::ml2::cisco::ucsm::ucsm_ip": "1.2.3.4",
       ....
  }
}

Environment
===========

RH OSP13 (queens)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/600396

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/600396
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=95245f6ad4a85584081cfe1004e44329995a85b1
Submitter: Zuul
Branch: master

commit 95245f6ad4a85584081cfe1004e44329995a85b1
Author: Sam Betts <email address hidden>
Date: Thu Sep 6 10:33:18 2018 +0100

    Remove incorrect mapped_data key from cisco ml2 hieradata

    Since os-apply-config changed to the hiera hook here:
    https://github.com/openstack/tripleo-heat-templates/commit/c5d10cd9fc94e6557417673190b73867a83cbb7b
    the mapped_data key is no longer required and results in an additional
    incorrect key being written to the hiera data. This patch removes it to
    ensure the hiera data for cisco ml2 works as expected.

    Change-Id: I730b107d4b5a002f82f658a83d11162606e44a16
    Closes-Bug: #1791044

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.opendev.org/699421

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/699421
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=7044c1858d03d92fe38a41aa05cd8c578348121d
Submitter: Zuul
Branch: stable/queens

commit 7044c1858d03d92fe38a41aa05cd8c578348121d
Author: Sam Betts <email address hidden>
Date: Thu Sep 6 10:33:18 2018 +0100

    Remove incorrect mapped_data key from cisco ml2 hieradata

    Since os-apply-config changed to the hiera hook here:
    https://github.com/openstack/tripleo-heat-templates/commit/c5d10cd9fc94e6557417673190b73867a83cbb7b
    the mapped_data key is no longer required and results in an additional
    incorrect key being written to the hiera data. This patch removes it to
    ensure the hiera data for cisco ml2 works as expected.

    Change-Id: I730b107d4b5a002f82f658a83d11162606e44a16
    Closes-Bug: #1791044
    (cherry picked from commit 95245f6ad4a85584081cfe1004e44329995a85b1)

[OpenStack Infra (hudson-openstack)]

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