Overriding ceph.conf variables replaces some TripleO managed settings

[Giulio Fidente]

It is possible to override arbitrary parameters in ceph-ansible using the ceph_confg_overrides structure, but we use that for the deployment of some settings which are overridden if user passes a new (and different) set of overrides

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/501983

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/501133
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=32bc2abf14af4ca1449e18b848e2be3cff013987
Submitter: Jenkins
Branch: master

commit 32bc2abf14af4ca1449e18b848e2be3cff013987
Author: Giulio Fidente <email address hidden>
Date: Wed Sep 6 09:39:12 2017 +0200

    Add CephConfigOverrides to allow arbitrary configs in ceph.conf

    We need to reuse the ceph_conf_overrides structure provided by
    ceph-ansible for both user provided configs and TripleO managed
    configs. This change merges the special user facing parameter
    with the TripleO generated configs.

    Also adds osd_scenario and osd_objectstore params for compatibility
    with newer ceph-ansible versions.

    Change-Id: I29c689c6c689590da5b6a3f581fdbec98a52e207
    Closes-Bug: #1715321

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/501983
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=643c4148ee10c51a49b95103f680d574fd5b139b
Submitter: Jenkins
Branch: stable/pike

commit 643c4148ee10c51a49b95103f680d574fd5b139b
Author: Giulio Fidente <email address hidden>
Date: Wed Sep 6 09:39:12 2017 +0200

    Add CephConfigOverrides to allow arbitrary configs in ceph.conf

    We need to reuse the ceph_conf_overrides structure provided by
    ceph-ansible for both user provided configs and TripleO managed
    configs. This change merges the special user facing parameter
    with the TripleO generated configs.

    Also adds osd_scenario and osd_objectstore params for compatibility
    with newer ceph-ansible versions.

    Change-Id: I29c689c6c689590da5b6a3f581fdbec98a52e207
    Closes-Bug: #1715321
    (cherry picked from commit 32bc2abf14af4ca1449e18b848e2be3cff013987)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.0.0b1 development milestone.