diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-22 10:52:03 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-26 12:23:08 +0000 |
| commit | e6fbc8e45d4d4df0caec8abc32280ac61c5efe26 (patch) | |
| tree | d07726ec22038787cd7c729b81cde29f6cb9819b | |
| parent | 3e203cbee8ce54ce761870e6ecfa25b38332ace9 (diff) | |
Fixes missing firewall rules for neutron_ovs_dpdk_agent service
Firewall config was being inherited by the dpdk service, however
since the firewall service name was the parent (neutron_ovs_agent)
and technically that service was not enabled - the rules were never
applied. This modifies the service name as it is inherited using
map_replace.
Closes-Bug: 1674689
Change-Id: I6676205b8fc1fd578cb2435ad97fe577a9e81d95
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 48a38a19347a18d4d35fb22de82136359aae5cb7)
| -rw-r--r-- | puppet/services/neutron-ovs-dpdk-agent.yaml | 5 | ||||
| -rw-r--r-- | releasenotes/notes/fix-neutron-dpdk-firewall-436aee39a0d7ed65.yaml | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/puppet/services/neutron-ovs-dpdk-agent.yaml b/puppet/services/neutron-ovs-dpdk-agent.yaml index e25bc495..2c7ab57c 100644 --- a/puppet/services/neutron-ovs-dpdk-agent.yaml +++ b/puppet/services/neutron-ovs-dpdk-agent.yaml @@ -69,7 +69,10 @@ outputs: service_name: neutron_ovs_dpdk_agent config_settings: 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::datapath_type: {get_param: NeutronDatapathType} neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir} diff --git a/releasenotes/notes/fix-neutron-dpdk-firewall-436aee39a0d7ed65.yaml b/releasenotes/notes/fix-neutron-dpdk-firewall-436aee39a0d7ed65.yaml new file mode 100644 index 00000000..bb18aed8 --- /dev/null +++ b/releasenotes/notes/fix-neutron-dpdk-firewall-436aee39a0d7ed65.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - Fixes firewall rules from neutron OVS agent not being + inherited correctly and applied in neutron OVS DPDK + template. |