openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Neutron: Migrate dvr parameters for ml2+ovs to ovs agent template"

Browse Source
This commit is contained in:
Zuul 2022-07-13 20:57:26 +00:00 committed by Gerrit Code Review
commit f2158cb6ea
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -95,10 +95,6 @@ parameters:
description: The password for the Placement service and db account description: The password for the Placement service and db account
type: string type: string
hidden: true hidden: true
NeutronEnableDVR:
description: Enable Neutron DVR.
default: false
type: boolean
NeutronEnableIgmpSnooping: NeutronEnableIgmpSnooping:
description: Enable IGMP Snooping. description: Enable IGMP Snooping.
type: boolean type: boolean
@ -421,8 +417,6 @@ outputs:
params: params:
$NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]}
tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA} 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: - if:
- neutron_workers_set - neutron_workers_set
- neutron::server::api_workers: {get_param: NeutronWorkers} - neutron::server::api_workers: {get_param: NeutronWorkers}

5
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -274,12 +274,15 @@ outputs:
- rsyslog: - rsyslog:
tripleo_logging_sources_neutron_ovs_agent: tripleo_logging_sources_neutron_ovs_agent:
- {get_param: NeutronOpenVswitchAgentLoggingSource} - {get_param: NeutronOpenVswitchAgentLoggingSource}
- collectd: collectd:
tripleo.collectd.plugins.neutron_ovs_agent: tripleo.collectd.plugins.neutron_ovs_agent:
- ovs_events - ovs_events
- ovs_stats - ovs_stats
collectd::plugin::ovs_events::socket: '/run/openvswitch/db.sock' collectd::plugin::ovs_events::socket: '/run/openvswitch/db.sock'
collectd::plugin::ovs_stats::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: puppet_config:
config_volume: neutron config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2,vs_config puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2,vs_config