From 89a36ba0043be2caa995d499d4f21644a55976c5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 12 Oct 2023 10:32:45 +0900
Subject: [PATCH] Remove remaining workaround for old puppetlabs-apache

The aio manifest was not updated when [1] was merged.

[1] 8fd4c8fae6db538bb3f95b5e6bb69617dcf02bee

Change-Id: Id1d68948c443088af2ee790142854fc8d36c6a9d
---
 fixtures/scenario-aio.pp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/fixtures/scenario-aio.pp b/fixtures/scenario-aio.pp
index c7f298a2b..8be955897 100644
--- a/fixtures/scenario-aio.pp
+++ b/fixtures/scenario-aio.pp
@@ -14,16 +14,8 @@
 # limitations under the License.
 #
 
-if ($facts['os']['family'] == 'Debian') {
-  include apache::params
-  class { 'apache':
-    mod_packages => merge($::apache::params::mod_packages, {
-      'wsgi' => 'libapache2-mod-wsgi-py3',
-    })
-  }
-}
-
 include openstack_integration
+include openstack_integration::apache
 include openstack_integration::rabbitmq
 include openstack_integration::mysql
 include openstack_integration::keystone