OVS based security groups parameter not populated correctly

[Kamil Sambor]

Description of problem:
When deploying the overcloud I used a yaml file that contains parameters related to neutron that needs to be updated on the overcloud nodes:

parameter_defaults:
    NeutronServicePlugins: qos,router,trunk
    NeutronOVSFirewallDriver: openvswitch

What happens is that NeutronOVSFirewallDriver got applied in two conf files with different values that override each other:

/etc/neutron/plugins/ml2/openvswitch_agent.ini: NeutronOVSFirewallDriver: openvswitch
/etc/neutron/plugins/ml2/ml2_conf.ini: NeutronOVSFirewallDriver: iptables

instead on one:
/etc/neutron/plugins/ml2/openvswitch_agent.ini: NeutronOVSFirewallDriver: openvswitch

Version-Release number of selected component (if applicable):
[root@undercloud-0 ~]# rpm -qa | grep -i neutron
python-neutron-12.0.3-2.el7ost.noarch
openstack-neutron-openvswitch-12.0.3-2.el7ost.noarch
puppet-neutron-12.4.1-1.3aa3109git.el7ost.noarch
openstack-neutron-ml2-12.0.3-2.el7ost.noarch
python2-neutron-lib-1.13.0-1.el7ost.noarch
openstack-neutron-12.0.3-2.el7ost.noarch
openstack-neutron-common-12.0.3-2.el7ost.noarch
python2-ironic-neutron-agent-1.0.0-1.el7ost.noarch
python2-neutronclient-6.7.0-1.el7ost.noarch
[root@undercloud-0 ~]# rpm -qa | grep tripleo
openstack-tripleo-ui-8.3.2-1.el7ost.noarch
openstack-tripleo-image-elements-8.0.1-1.el7ost.noarch
openstack-tripleo-heat-templates-8.0.4-20.el7ost.noarch
ansible-tripleo-ipsec-8.1.1-0.20180308133440.8f5369a.el7ost.noarch
openstack-tripleo-puppet-elements-8.0.1-1.el7ost.noarch
openstack-tripleo-common-8.6.3-10.el7ost.noarch
puppet-tripleo-8.3.4-5.el7ost.noarch
openstack-tripleo-common-containers-8.6.3-10.el7ost.noarch
python-tripleoclient-9.2.3-4.el7ost.noarch

How reproducible:
100%

Steps to Reproduce:
1. before deploying the overcloud add the following to a yaml file and add it to the deploy command using -e <path to file>
parameter_defaults:
    NeutronServicePlugins: qos,router,trunk
    NeutronOVSFirewallDriver: openvswitch
2. Run the overcloud deploy
3.

Actual results:
duplicate parameters with different values applied to different configuration files

Expected results:
only one parameter change in only one file with the correct value

Additional info:

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/597387
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=5c4983fd2458bbdbf05e82730f91b66c8b2737a1
Submitter: Zuul
Branch: master

commit 5c4983fd2458bbdbf05e82730f91b66c8b2737a1
Author: Kamil Sambor <email address hidden>
Date: Wed Aug 29 08:33:51 2018 +0200

    Remove unused config file when start ovs agent

    ml2_conf.ini shoudn't be used in neutron-ovs-agent
    Some parameters can be in conflict and overwrite
    each other eg firewall_driver. Using openvswitch_agent
    is enought to configure correct agent.

    Change-Id: I815cb67fd4ea9ad98347d6d6bbcc9bcf01113649
    Closes-Bug: 1789549

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/598158

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/598161

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/598158
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=cec7627ddb10a5829cb0f1da9483670cb53e5624
Submitter: Zuul
Branch: stable/rocky

commit cec7627ddb10a5829cb0f1da9483670cb53e5624
Author: Kamil Sambor <email address hidden>
Date: Wed Aug 29 08:33:51 2018 +0200

    Remove unused config file when start ovs agent

    ml2_conf.ini shoudn't be used in neutron-ovs-agent
    Some parameters can be in conflict and overwrite
    each other eg firewall_driver. Using openvswitch_agent
    is enought to configure correct agent.

    Change-Id: I815cb67fd4ea9ad98347d6d6bbcc9bcf01113649
    Closes-Bug: 1789549
    (cherry picked from commit 5c4983fd2458bbdbf05e82730f91b66c8b2737a1)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/598161
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=bb503cb8a66dffe04034fbe91b7c90d01b42c8b4
Submitter: Zuul
Branch: stable/queens

commit bb503cb8a66dffe04034fbe91b7c90d01b42c8b4
Author: Kamil Sambor <email address hidden>
Date: Wed Aug 29 08:33:51 2018 +0200

    Remove unused config file when start ovs agent

    ml2_conf.ini shoudn't be used in neutron-ovs-agent
    Some parameters can be in conflict and overwrite
    each other eg firewall_driver. Using openvswitch_agent
    is enought to configure correct agent.

    Change-Id: I815cb67fd4ea9ad98347d6d6bbcc9bcf01113649
    Closes-Bug: 1789549
    (cherry picked from commit 5c4983fd2458bbdbf05e82730f91b66c8b2737a1)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.0.0.0rc2 release candidate.

[OpenStack Infra (hudson-openstack)]

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