Merge "Remove the OVNVifType parameter"

2021-04-09 05:18:51 +00:00 · 2021-04-09 05:18:51 +00:00 · a5bf08bcaa
commit a5bf08bcaa
parent b9e4f73207 9d1e917949
7 changed files with 5 additions and 14 deletions
--- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml
+++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml
@ -39,14 +39,6 @@ parameters:
    description: Timeout in seconds for the OVSDB connection transaction
    type: number
    default: 180
-  OVNVifType:
-    description: Type of VIF to be used for ports
-    type: string
-    default: ovs
-    constraints:
-      - allowed_values:
-          - ovs
-          - vhostuser
  OVNNeutronSyncMode:
    description: The synchronization mode of OVN with Neutron DB
    type: string
@ -135,7 +127,6 @@ outputs:
            ovn::northbound::port: {get_param: OVNNorthboundServerPort}
            neutron::plugins::ml2::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
            neutron::plugins::ml2::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode}
-            neutron::plugins::ml2::ovn::vif_type: {get_param: OVNVifType}
            neutron::plugins::ml2::ovn::ovn_metadata_enabled: {get_param: OVNMetadataEnabled}
            neutron::server::qos_notification_drivers: {get_param: OVNQosDriver}
            neutron::server::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
--- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
@ -16,7 +16,6 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ovn
-  OVNVifType: ovs
  OVNNeutronSyncMode: log
  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
--- a/environments/services-baremetal/neutron-ovn-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-ha.yaml
@ -15,7 +15,6 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ovn
-  OVNVifType: ovs
  OVNNeutronSyncMode: log
  OVNQosDriver: ovn-qos
  NeutronEnableDVR: false
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@ -17,7 +17,6 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ovn
-  OVNVifType: ovs
  OVNNeutronSyncMode: log
  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
--- a/environments/services/neutron-ovn-ha.yaml
+++ b/environments/services/neutron-ovn-ha.yaml
@ -15,7 +15,6 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ovn
-  OVNVifType: ovs
  OVNNeutronSyncMode: log
  OVNQosDriver: ovn-qos
  NeutronEnableDVR: False
--- a/environments/services/neutron-ovn-standalone.yaml
+++ b/environments/services/neutron-ovn-standalone.yaml
@ -17,7 +17,6 @@ resource_registry:

 parameter_defaults:
  NeutronMechanismDrivers: ovn
-  OVNVifType: ovs
  OVNNeutronSyncMode: log
  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
--- a/releasenotes/notes/remove-ovn-vif_type-1c09bf29d1bd38da.yaml
+++ b/releasenotes/notes/remove-ovn-vif_type-1c09bf29d1bd38da.yaml
@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``OVNVifType`` parameter has been removed because the parameter was not
+    used in Neutron.