From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 28 Sep 2015 19:34:35 +0000 (-0400)
Subject: stop managing File resources
X-Git-Tag: 7.0.0-mos-rc2^2~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=409e35a77671e3b129ad387f5e03f57cbe91872c;p=puppet-modules%2Fpuppet-ceilometer.git

stop managing File resources

Drop any 'File' resource that is already managed by upstream packaging.

Partial-bug: #1458915

Change-Id: I47b12069362a9ec707df71d41f91dcccfa318c13
---

diff --git a/manifests/init.pp b/manifests/init.pp
index b3dbdaa..30c439f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -172,10 +172,6 @@ class ceilometer(
     fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
   }
 
-  File {
-    require => Package['ceilometer-common'],
-  }
-
   group { 'ceilometer':
     name    => 'ceilometer',
     require => Package['ceilometer-common'],
@@ -188,19 +184,6 @@ class ceilometer(
     require => Package['ceilometer-common'],
   }
 
-  file { '/etc/ceilometer/':
-    ensure => directory,
-    owner  => 'ceilometer',
-    group  => 'ceilometer',
-    mode   => '0750',
-  }
-
-  file { '/etc/ceilometer/ceilometer.conf':
-    owner => 'ceilometer',
-    group => 'ceilometer',
-    mode  => '0640',
-  }
-
   package { 'ceilometer-common':
     ensure => $package_ensure,
     name   => $::ceilometer::params::common_package_name,
diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 34bb792..51ab35d 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -106,25 +106,6 @@ describe 'ceilometer' do
       )
     end
 
-    it 'configures ceilometer configuration folder' do
-      is_expected.to contain_file('/etc/ceilometer/').with(
-        :ensure  => 'directory',
-        :owner   => 'ceilometer',
-        :group   => 'ceilometer',
-        :mode    => '0750',
-        :require => 'Package[ceilometer-common]'
-      )
-    end
-
-    it 'configures ceilometer configuration file' do
-      is_expected.to contain_file('/etc/ceilometer/ceilometer.conf').with(
-        :owner   => 'ceilometer',
-        :group   => 'ceilometer',
-        :mode    => '0640',
-        :require => 'Package[ceilometer-common]'
-      )
-    end
-
     it 'installs ceilometer common package' do
       is_expected.to contain_package('ceilometer-common').with(
         :ensure => 'present',