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

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}

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