From 201f4db587738633e0b620e65e449f40f420155c Mon Sep 17 00:00:00 2001 From: "Mikolaj.Rzadca" Date: Tue, 19 May 2020 11:53:39 +0200 Subject: [PATCH] enable dpdk plugin on neutron ovn and ovs This patch causes the dpdk_telemetry plugin will be installed only on nodes with the dpdk role Change-Id: I57fd151512c3a215d02667a6e1c4e755b88e4b05 (cherry picked from commit 1666f1ec31ae801e8ae2e5c807c7b944f3a531fa) --- .../neutron/neutron-ovn-dpdk-config-container-puppet.yaml | 6 ++++++ .../neutron/neutron-ovs-dpdk-agent-container-puppet.yaml | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml index 007c65390b..a27d97a7ab 100644 --- a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml +++ b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml @@ -87,5 +87,11 @@ outputs: - ovn::controller::datapath_type: "netdev" nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]} - get_attr: [RoleParametersValue, value] + service_config_settings: + map_merge: + - get_attr: [OpenvswitchDpdk, role_data, service_config_settings] + - collectd: + tripleo.collectd.plugins.neutron_ovn_dpdk: + - dpdk_telemetry deploy_steps_tasks: - get_attr: [OpenvswitchDpdk, role_data, deploy_steps_tasks] diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml index 8485cd33be..d5731b1fb3 100644 --- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml @@ -120,7 +120,11 @@ outputs: - nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]} - get_attr: [RoleParametersValue, value] service_config_settings: - get_attr: [NeutronOvsAgent, role_data, service_config_settings] + map_merge: + - get_attr: [NeutronOvsAgent, role_data, service_config_settings] + - collectd: + tripleo.collectd.plugins.neutron_ovs_dpdk_agent: + - dpdk_telemetry puppet_config: config_volume: neutron puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2