From 32d5faae96ddfaadf99328e877bcfd3495f868c4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 3 Jun 2022 14:34:00 +0900
Subject: [PATCH] CentOS: Re-enable ml2+linux bridge

Change-Id: I0fd491c27708e303fc5f8fd1bb4c3ca13a9a5c99
(cherry picked from commit 85b8e3a4bdd3f2be071afcc25d583e6147114cb1)
(cherry picked from commit c54d97d95d45b6051bb47e5f527ebfc054cda6bc)
(cherry picked from commit 2d4c99c3dd35d9a9f4a4c84776359425ae57401b)
(cherry picked from commit 5171c319ae4b2ca1d6211068036090ed3d3a9dca)
(cherry picked from commit 78e0c85ba70a9c77e4cacdcf7beb4fdca44ad431)
---
 fixtures/scenario003.pp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 7a1b0c12b..da20c6784 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -83,15 +83,9 @@ include openstack_integration::rabbitmq
 include openstack_integration::mysql
 include openstack_integration::keystone
 include openstack_integration::glance
-# RHEL8 has an issue with linuxbridge driver https://bugzilla.redhat.com/show_bug.cgi?id=1720637
-if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-  $neutron_driver = undef
-} else {
-  $neutron_driver = 'linuxbridge'
-}
 
 class { 'openstack_integration::neutron':
-  driver => $neutron_driver,
+  driver => 'linuxbridge',
 }
 include openstack_integration::placement
 include openstack_integration::nova