Allow neutron_options customization for dashboard

[Christopher Brown]

Currently the code does not allow neutron_options to be specified.

The following patch fixes this:

https://review.openstack.org/#/c/260226/

This has not been committed to master due to invasive changes related to composable services but it would be good to get this into Mitaka.

I have cherry-picked this to Mitaka branches as a simple backport fix.

[Steven Hardy (shardy)]

https://review.openstack.org/#/c/260226/ is the patch to master

[Steven Hardy (shardy)]

https://review.openstack.org/#/c/331680/ is the patch to stable/mitaka

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/331680
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4ed7609557ee7418d80e48c5be7dcc2b3a8d8d8e
Submitter: Jenkins
Branch: stable/mitaka

commit 4ed7609557ee7418d80e48c5be7dcc2b3a8d8d8e
Author: Dimitri Savineau <email address hidden>
Date: Mon Dec 21 17:00:30 2015 -0500

    Allow neutron_options customization for dashboard

    backport: mitaka
    Closes-Bug: 1594388

    By default only profile_support can be configured depending of the neutron
    mechanism driver used (cisco_n1kv).
    This patch allows to add more neutron options to enable lbaas, vpnaas, etc...

    Change-Id: I3b3019890a146dd641d6efeb880c5de125d8d132
    (cherry picked from commit 5e1229c75552df9bd0795a612650a1bc8a9fe8aa)

[Doug Hellmann (doug-hellmann)]

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

[OpenStack Infra (hudson-openstack)]

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

[Dimitri Savineau (dsavineau)]

It seems that the fix hasn't been replicated during the creation of the horizon composable role in newton+

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/397927
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=ec26b43d7b723f02522b9e41d3ee335566574d19
Submitter: Jenkins
Branch: master

commit ec26b43d7b723f02522b9e41d3ee335566574d19
Author: Dimitri Savineau <email address hidden>
Date: Tue Nov 15 14:55:06 2016 -0500

    Allow neutron_options customization for dashboard

    By default only profile_support can be configured depending of the neutron
    mechanism driver used (cisco_n1kv).
    This patch allows to add more neutron options to enable lbaas, vpnaas, etc...

    Change-Id: I7c040519b45b60910778f93b8ffe7a413b4cb6ae
    Closes-Bug: #1594388

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 7.0.0 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/573835

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/573835
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=16c6161d126cb8ab477da103dc6510b93f171c1e
Submitter: Zuul
Branch: stable/ocata

commit 16c6161d126cb8ab477da103dc6510b93f171c1e
Author: Dimitri Savineau <email address hidden>
Date: Tue Nov 15 14:55:06 2016 -0500

    Allow neutron_options customization for dashboard

    By default only profile_support can be configured depending of the neutron
    mechanism driver used (cisco_n1kv).
    This patch allows to add more neutron options to enable lbaas, vpnaas, etc...

    Change-Id: I7c040519b45b60910778f93b8ffe7a413b4cb6ae
    Closes-Bug: #1594388
    (cherry picked from commit ec26b43d7b723f02522b9e41d3ee335566574d19)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/573836
Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=439f4df93c7a90193406ceba0d5df0b5580ee6c1
Submitter: Zuul
Branch: stable/newton

commit 439f4df93c7a90193406ceba0d5df0b5580ee6c1
Author: Dimitri Savineau <email address hidden>
Date: Tue Nov 15 14:55:06 2016 -0500

    Allow neutron_options customization for dashboard

    By default only profile_support can be configured depending of the neutron
    mechanism driver used (cisco_n1kv).
    This patch allows to add more neutron options to enable lbaas, vpnaas, etc...

    Change-Id: I7c040519b45b60910778f93b8ffe7a413b4cb6ae
    Closes-Bug: #1594388
    (cherry picked from commit 16c6161d126cb8ab477da103dc6510b93f171c1e)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-tripleo 6.5.14 release.