Skip to content

Commit 82db41d

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored andcommitted
Merge "Remove explicit requires on ceilometer class"
2 parents 4d2dd27 + b062013 commit 82db41d

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

manifests/proxy/ceilometer.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
target => '/etc/swift/proxy-server.conf',
104104
content => template('swift/proxy/ceilometer.conf.erb'),
105105
order => '260',
106-
require => Class['::ceilometer'],
107106
}
108107

109108
package { 'python-ceilometermiddleware':

spec/classes/swift_proxy_ceilometer_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class { "swift":
1717
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/[filter:ceilometer]/) }
1818
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/paste.filter_factory = ceilometermiddleware.swift:filter_factory/) }
1919
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/url = rabbit:\/\/guest:guest@127.0.0.1:5672\//) }
20-
it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')}
2120
it { is_expected.to contain_user('swift').with_groups('ceilometer') }
2221
it { is_expected.to contain_file('/var/log/ceilometer/swift-proxy-server.log').with(:owner => 'swift', :group => 'swift', :mode => '0664') }
2322
end

0 commit comments

Comments
 (0)