From 7a4c36e1dbf2520f5a975b852e171f3eaed41bb8 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 17 Jun 2019 17:12:25 +0200 Subject: [PATCH] Fix sites-enabled warning 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 --- manifests/panko.pp | 7 +------ manifests/sahara.pp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/manifests/panko.pp b/manifests/panko.pp index c168c6fab..452562c8a 100644 --- a/manifests/panko.pp +++ b/manifests/panko.pp @@ -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': diff --git a/manifests/sahara.pp b/manifests/sahara.pp index b7bdcfb98..45f7def9f 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -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