LMA plugins break hiera.yaml with latest ISO

[Simon Pasquier]

Tested with ISO #284.

The Elasticsearch/Kibana plugin (at least) fails to deploy with ISO #284. The root cause is that the LMA collector plugin breaks the Hiera configuration when modifying it to include the LMA data.

Here is a copy of the Hiera configuration after deployment:
---
  !ruby/sym backends:
    - yaml
  !ruby/sym hierarchy:
    - "override/node/%{::fqdn}"
    - "override/class/%{calling_class}"
    - "override/module/%{calling_module}"
    - override/plugins
    - override/common
    - "override/configuration/%{::fqdn}"
    - override/configuration/role
    - override/configuration/cluster
    - "class/%{calling_class}"
    - "module/%{calling_module}"
    - nodes
    - globals
    - astute
  !ruby/sym yaml:
    !ruby/sym datadir: /etc/hiera
  !ruby/sym logger: noop
  !ruby/sym merge_behavior: deeper
  - override/alarming
  - override/gse_filters

The last 2 lines should be inserted after the "override/module/%{calling_module}" line.

[1] https://github.com/openstack/fuel-plugin-lma-collector/blob/6f787bb6bc713a7bf5f093950f936cb5cd8a1981/deployment_scripts/puppet/modules/lma_collector/manifests/hiera_data.pp#L52

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/260385
Committed: https://git.openstack.org/cgit/openstack/fuel-plugin-lma-collector/commit/?id=ef2d5d8bb487bfe20997adf1dac44c5c43fa1800
Submitter: Jenkins
Branch: master

commit ef2d5d8bb487bfe20997adf1dac44c5c43fa1800
Author: Simon Pasquier <email address hidden>
Date: Tue Dec 22 09:31:57 2015 +0100

    Add Puppet provider for managing Hiera sources

    This change introduces a new Puppet provider that can add and remove
    sources in the Hiera configuration. It replaces the previous mechanism
    that used the file_line resource because it was too fragile and
    couldn't cope with differences in YAML formatting.

    Eventually this will be natively supported by the Fuel plugin framework
    but it's not there yet.

    Change-Id: Ie7563a9edf540bb81bdc30bc0200b7a25e25962f
    Closes-Bug: #1527253

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/0.8
Review: https://review.openstack.org/262485

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/262485
Committed: https://git.openstack.org/cgit/openstack/fuel-plugin-lma-collector/commit/?id=53bf631fedabd4cf5af71a8af4d1dddecb2bb0fd
Submitter: Jenkins
Branch: stable/0.8

commit 53bf631fedabd4cf5af71a8af4d1dddecb2bb0fd
Author: Simon Pasquier <email address hidden>
Date: Tue Dec 22 09:31:57 2015 +0100

    Add Puppet provider for managing Hiera sources

    This change introduces a new Puppet provider that can add and remove
    sources in the Hiera configuration. It replaces the previous mechanism
    that used the file_line resource because it was too fragile and
    couldn't cope with differences in YAML formatting.

    Eventually this will be natively supported by the Fuel plugin framework
    but it's not there yet.

    Change-Id: Ie7563a9edf540bb81bdc30bc0200b7a25e25962f
    Closes-Bug: #1527253
    (cherry picked from commit ef2d5d8bb487bfe20997adf1dac44c5c43fa1800)