From 9be1ee2c5238f4cab32e4c9695ec041b03e3b32c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 29 Jun 2022 08:19:08 +0900 Subject: [PATCH] Neutron: Migrate dvr parameters for ml2+ovs to ovs agent template ... from neutron-server template. These parameters are not used when the other agents are used and are quite confusing especially when ml2+ovn, which has the opposite default, is used. Change-Id: Id6f83ae4621714d6a0d5234f571cd5480120e74b --- deployment/neutron/neutron-api-container-puppet.yaml | 6 ------ deployment/neutron/neutron-ovs-agent-container-puppet.yaml | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 0c13173a42..c4cb38fb9a 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -95,10 +95,6 @@ parameters: description: The password for the Placement service and db account type: string hidden: true - NeutronEnableDVR: - description: Enable Neutron DVR. - default: false - type: boolean NeutronEnableIgmpSnooping: description: Enable IGMP Snooping. type: boolean @@ -421,8 +417,6 @@ outputs: params: $NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]} tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA} - - neutron::server::router_distributed: {get_param: NeutronEnableDVR} - neutron::server::enable_dvr: {get_param: NeutronEnableDVR} - if: - neutron_workers_set - neutron::server::api_workers: {get_param: NeutronWorkers} diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 4a1462f834..7fdfae74d1 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -274,12 +274,15 @@ outputs: - rsyslog: tripleo_logging_sources_neutron_ovs_agent: - {get_param: NeutronOpenVswitchAgentLoggingSource} - - collectd: + collectd: tripleo.collectd.plugins.neutron_ovs_agent: - ovs_events - ovs_stats collectd::plugin::ovs_events::socket: '/run/openvswitch/db.sock' collectd::plugin::ovs_stats::socket: '/run/openvswitch/db.sock' + neutron_api: + neutron::server::router_distributed: {get_param: NeutronEnableDVR} + neutron::server::enable_dvr: {get_param: NeutronEnableDVR} puppet_config: config_volume: neutron puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2,vs_config