openstack/puppet-swift
Code Issues Proposed changes

Remove explicit requires on ceilometer class

Browse Source 
In cases where ceilometer and proxy server are not running on
the same node this breaks things. Let the installers handle
the dependency based on where these services run.

Change-Id: Ided6c1229178059a5e3ecc54442170b54ac7c421
This commit is contained in:
Pradeep Kilambi
2016-09-16 18:09:40 -04:00
parent 10e94f9a07
commit b062013099
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/proxy/ceilometer.pp
View File

@@ -103,7 +103,6 @@ class swift::proxy::ceilometer(
target => '/etc/swift/proxy-server.conf',
content => template('swift/proxy/ceilometer.conf.erb'),
order => '260',
require => Class['::ceilometer'],
}
package { 'python-ceilometermiddleware':

1
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -17,7 +17,6 @@ describe 'swift::proxy::ceilometer' do
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/[filter:ceilometer]/) }
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/paste.filter_factory = ceilometermiddleware.swift:filter_factory/) }
it { is_expected.to contain_concat_fragment('swift_ceilometer').with_content(/url = rabbit:\/\/guest:guest@127.0.0.1:5672\//) }
it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')}
it { is_expected.to contain_user('swift').with_groups('ceilometer') }
it { is_expected.to contain_file('/var/log/ceilometer/swift-proxy-server.log').with(:owner => 'swift', :group => 'swift', :mode => '0664') }
end