openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix sites-enabled warning

Browse Source 
Since the config files in sites-enabled is symlinks to
the ones in sites-available this was unneccesary and
just outputs warnings for nothing.

Example:
Stage[main]/Openstack_integration::Panko/File[/etc/apache2/sites-enabled/panko-api.conf]
(warning): Ensure set to :present but file type is link so no content
will be synced

Change-Id: I73e706c03a611dfc7cd5572b3d4599be671c85a2
This commit is contained in:
Tobias Urdin 2019-06-17 17:12:25 +02:00
parent 6e564f96f7
commit 7a4c36e1db
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