openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fixes missing firewall rules for neutron_ovs_dpdk_agent service"

Browse Source
This commit is contained in:
Jenkins 2017-03-25 20:54:36 +00:00 committed by Gerrit Code Review
commit 12fbad1345
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet/services/neutron-ovs-dpdk-agent.yaml
View File

@ -69,7 +69,10 @@ outputs:
service_name: neutron_ovs_dpdk_agent service_name: neutron_ovs_dpdk_agent
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [NeutronOvsAgent, role_data, config_settings] - map_replace:
- get_attr: [NeutronOvsAgent, role_data, config_settings]
- keys:
tripleo.neutron_ovs_agent.firewall_rules: tripleo.neutron_ovs_dpdk_agent.firewall_rules
- neutron::agents::ml2::ovs::enable_dpdk: true - neutron::agents::ml2::ovs::enable_dpdk: true
neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType} neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir} neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}

5
releasenotes/notes/fix-neutron-dpdk-firewall-436aee39a0d7ed65.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes firewall rules from neutron OVS agent not being
inherited correctly and applied in neutron OVS DPDK
template.