Merge "Configure OVNCMSOptions=enable-chassis-as-gw within neutron-ovn-sriov.yaml" into stable/victoria

environments/services/neutron-ovn-dvr-ha.yaml

@@ -29,7 +29,5 @@ parameter_defaults:
   NeutronPluginExtensions: "qos,port_security,dns"
   ControllerParameters:
     OVNCMSOptions: "enable-chassis-as-gw"
-  ControllerSriovParameters:
-    OVNCMSOptions: "enable-chassis-as-gw"
   OVNDnsServers: []
   KernelIpNonLocalBind: 1

environments/services/neutron-ovn-ha.yaml

@@ -29,11 +29,7 @@ parameter_defaults:
     NeutronBridgeMappings: ""
   ControllerParameters:
     OVNCMSOptions: "enable-chassis-as-gw"
-  ControllerSriovParameters:
-    OVNCMSOptions: "enable-chassis-as-gw"
   NetworkerParameters:
     OVNCMSOptions: "enable-chassis-as-gw"
-  NetworkerSriovParameters:
-    OVNCMSOptions: "enable-chassis-as-gw"
   OVNDnsServers: []
   KernelIpNonLocalBind: 1

environments/services/neutron-ovn-sriov.yaml

@@ -4,7 +4,7 @@
 # A Heat environment that can be used to enable SR-IOV support in neutron with OVN
 # mechanism driver.
 # This environment file should be included after the main OVN environment
-# file - neutron-ovn-ha.yaml/neutron-ovn-dvr(-ha).yaml is included.
+# file - neutron-ovn-ha.yaml is included.
 
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
@@ -13,3 +13,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','ovn']
   NovaSchedulerDefaultFilters: ['AvailabilityZoneFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
   NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
+  ControllerSriovParameters:
+    OVNCMSOptions: "enable-chassis-as-gw"
+  NetworkerSriovParameters:
+    OVNCMSOptions: "enable-chassis-as-gw"