rabbit host info gets overidden during newton ugrades

[Pradeep Kilambi]

During upgrade from RHOS-9 to RHOS-10 rabbit* options in ceilometer.conf are overridden after 'controller and block storage' stage.

Excerpt from ceilometer.conf

[oslo_messaging_rabbit]
rabbit_host=127.0.0.1
rabbit_port=5672
rabbit_hosts=127.0.0.1:5672
rabbit_use_ssl=False
rabbit_userid=guest
rabbit_password=naAt9M4dZW9vd7UnXGJVKB2xs
rabbit_virtual_host=/
rabbit_ha_queues=False
heartbeat_timeout_threshold=60
heartbeat_rate=2

This causes next messages in collector and agent-notification.log:
------------------------------------------------------------------
2016-11-23 14:07:03.907 26451 ERROR oslo.messaging._drivers.impl_rabbit [-] [c275de08-1f4d-4b6f-8d55-df5fc56cbb3d] AMQP server on 127.0.0.1:5672 is unreachable: [Errno 111] Connection refused. Trying again in 32 seconds. Client port: None
2016-11-23 14:07:35.945 26451 ERROR oslo.messaging._drivers.impl_rabbit [-] [c275de08-1f4d-4b6f-8d55-df5fc56cbb3d] AMQP server on 127.0.0.1:5672 is unreachable: [Errno 111] Connection refused. Trying again in 32 seconds. Client port: None
2016-11-23 14:08:07.982 26451 ERROR oslo.messaging._drivers.impl_rabbit [-] [c275de08-1f4d-4b6f-8d55-df5fc56cbb3d] AMQP server on 127.0.0.1:5672 is unreachable: [Errno 111] Connection refused. Trying again in 32 seconds. Client port: None

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/401404

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/401322
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34
Submitter: Jenkins
Branch: master

commit 4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34
Author: Pradeep Kilambi <email address hidden>
Date: Wed Nov 23 10:39:08 2016 -0500

    Explicitly set rabbit hosts so its not overridden during upgrade

    During ceilometer pre upgrade, rabbit host config gets overridden in
    ceilometer conf as its setting to defaults. This explicitly sets the
    host info in standalone manifest.

    Closes-Bug: #1644278

    Change-Id: I862ea7165c5d42ba1f9a19111a8be8934c0ef883

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/401404
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=1df46eada92dbdf452956c06c2a3f6321365856a
Submitter: Jenkins
Branch: stable/newton

commit 1df46eada92dbdf452956c06c2a3f6321365856a
Author: Pradeep Kilambi <email address hidden>
Date: Wed Nov 23 10:39:08 2016 -0500

    Explicitly set rabbit hosts so its not overridden during upgrade

    During ceilometer pre upgrade, rabbit host config gets overridden in
    ceilometer conf as its setting to defaults. This explicitly sets the
    host info in standalone manifest.

    Closes-Bug: #1644278

    Change-Id: I862ea7165c5d42ba1f9a19111a8be8934c0ef883
    (cherry picked from commit 4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 6.0.0.0b2 development milestone.

[OpenStack Infra (hudson-openstack)]

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