openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Fix sites-enabled warning"

This commit is contained in:
Zuul 2019-06-20 04:08:09 +00:00 committed by Gerrit Code Review
parent ae8a9fff38 7a4c36e1db
commit 0ee105807e
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/panko.pp
View File

@ -50,13 +50,8 @@ class openstack_integration::panko {
'ensure' => 'present',
'content' => '',
})
ensure_resource('file', '/etc/apache2/sites-enabled/panko-api.conf', {
'ensure' => 'present',
'content' => '',
})
Package['panko-api'] -> File['/etc/apache2/sites-available/panko-api.conf']
-> File['/etc/apache2/sites-enabled/panko-api.conf'] ~> Anchor['panko::install::end']
Package['panko-api'] -> File['/etc/apache2/sites-available/panko-api.conf'] ~> Anchor['panko::install::end']
}
include ::apache
class { '::panko::wsgi::apache':

7
manifests/sahara.pp
View File

@ -77,13 +77,8 @@ class openstack_integration::sahara (
'ensure' => 'present',
'content' => '',
})
ensure_resource('file', '/etc/apache2/sites-enabled/sahara-api.conf', {
'ensure' => 'present',
'content' => '',
})
Package['sahara-api'] -> File['/etc/apache2/sites-available/sahara-api.conf']
-> File['/etc/apache2/sites-enabled/sahara-api.conf'] ~> Anchor['sahara::install::end']
Package['sahara-api'] -> File['/etc/apache2/sites-available/sahara-api.conf'] ~> Anchor['sahara::install::end']
}
include ::apache