openstack/puppet-openstack-integration
Code Issues Proposed changes

Sahara: Remove workaround to purge default vhost config

Browse Source 
... because now the file should be purged by the apache class.

Depends-on: https://review.opendev.org/824124
Change-Id: I4b6d580362e92286d2a0fd13e1841295c4fea1e7
This commit is contained in:
Takashi Kajinami 2022-01-11 19:01:08 +09:00
parent 77fd803950
commit 405bb3a630
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/sahara.pp
View File

@ -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,