From b28243fa8b63a0ecfa5f82383735cd987a267eff Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Wed, 7 Oct 2020 09:53:59 +0000
Subject: [PATCH] Include ovs_driver and sriov_driver classes in base neutron
 profile

This classes are needed to configure things related to the
sriov or ovs mechanism drivers on neutron server like e.g.
vnic_type_blacklist.

Depends-On: https://review.opendev.org/757747/

Change-Id: Ia014cb098591a28ddfcd8b3dff536fa2337d23a8
(cherry picked from commit 3f2171acbd1ad842026f96f89c910a7da5e77f52)
---
 manifests/profile/base/neutron/plugins/ml2.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 23a9da8f3..9ad684c7f 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -55,6 +55,14 @@ class tripleo::profile::base::neutron::plugins::ml2 (
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::plugins::ml2
 
+    if 'openvswitch' in $mechanism_drivers {
+      include ::neutron::plugins::ml2::ovs_driver
+    }
+
+    if 'sriovnicswitch' in $mechanism_drivers {
+      include ::neutron::plugins::ml2::sriov_driver
+    }
+
     if 'cisco_n1kv' in $mechanism_drivers {
       include ::tripleo::profile::base::neutron::n1k
     }