diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-25 20:54:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-25 20:54:36 +0000 |
| commit | 12fbad1345c34a7c6f7da7490dbb0601b8f90fe9 (patch) | |
| tree | c626c3342c5f724b0f17b244bb26177edd4844a9 /puppet | |
| parent | d0a5c71e726f430e60ea6f18a593aaa414e406d1 (diff) | |
| parent | 48a38a19347a18d4d35fb22de82136359aae5cb7 (diff) | |
Merge "Fixes missing firewall rules for neutron_ovs_dpdk_agent service"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/neutron-ovs-dpdk-agent.yaml | 5 |
1 files changed, 4 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} |