From 77ef08db825264e09e7bd3d7b5d1c2f27680a6d7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Jan 2022 18:41:30 +0900
Subject: [PATCH] Sahara: Remove the logic to clear the default vhost file

... because the file should be purged by the apache class, after

Depends-on: https://review.opendev.org/824124
Change-Id: I75da1f430ebdb15f400cd210218575d0ba8c8d66
---
 manifests/sahara.pp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/manifests/sahara.pp b/manifests/sahara.pp
index 8db7af03a..88f140167 100644
--- a/manifests/sahara.pp
+++ b/manifests/sahara.pp
@@ -72,18 +72,6 @@ class openstack_integration::sahara (
     service_name => $service_name,
   }
   if $service_name == 'httpd' {
-    # NOTE(tobias-urdin): The sahara-api package in Ubuntu installs this apache vhosts which we
-    # do not need since we create them using the puppetlabs-apache module. Set them as empty
-    # so that package upgrades still work.
-    if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '18') >= 0) {
-      ensure_resource('file', '/etc/apache2/sites-available/sahara-api.conf', {
-        'ensure'  => 'present',
-        'content' => '',
-      })
-
-      Package['sahara-api'] -> File['/etc/apache2/sites-available/sahara-api.conf'] ~> Anchor['sahara::install::end']
-    }
-
     include apache
     class { 'sahara::wsgi::apache':
       bind_host => $::openstack_integration::config::ip_for_url,