Sync Horizon local_settings template with upstream version

[Ryan Moe]

When we synced the upstream Horizon modules we overrode the local_settings template path [0]. This caused at least one bug [1]. We should compare the differences and see if we can either use the upstream one outright or merge important changes from upstream into our template if the former isn't possible.

[0] https://github.com/stackforge/fuel-library/commit/ed0875628a042e695b5b2d9b7eb7c55605741a3a#diff-713b6c6b2f9772e472f0c932a307d323R41
[1] https://bugs.launchpad.net/fuel/+bug/1425169

[Bartłomiej Piotrowski (bpiotrowski)]

There is literally one change to backport (unless we merge more upstream modules), I'll send it for review shortly.

[Bartłomiej Piotrowski (bpiotrowski)]

Or I actually won't, as it's needed only for Ruby 1.8 : https://github.com/stackforge/puppet-horizon/commit/915f0741adcd4becfa2f5156203a5c06a6cc62d6

Ryan, do you think this bug can be closed?

[Bartłomiej Piotrowski (bpiotrowski)]

And we actually use it on CentOS nodes, but not on master node, so re-opening.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/165026
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=d24c446aa57ed98bcd3ea9f6cd7cd14457af2653
Submitter: Jenkins
Branch: master

commit d24c446aa57ed98bcd3ea9f6cd7cd14457af2653
Author: Bartłomiej Piotrowski <email address hidden>
Date: Tue Mar 17 11:57:49 2015 +0100

    Sync upstream changes to Horizon local_settings template

    Closes-Bug: 1425342
    Change-Id: I6c26dd36c2ae46f6ad04654524834649a6c9a0a3