From 85b8e3a4bdd3f2be071afcc25d583e6147114cb1 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
---
 fixtures/scenario003.pp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 1e26e14f4..2af90a1c1 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -74,15 +74,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