openstack
/
puppet-ceilometer
Code Issues Proposed changes

Merge "Ensure pipeline yamls are created with correct permissions"

This commit is contained in:
Jenkins 2017-07-06 18:54:03 +00:00 committed by Gerrit Code Review
parent 1c6943edcd abf547dca0
commit 30e069012d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/agent/notification.pp
View File

@ -133,6 +133,9 @@ class ceilometer::agent::notification (
path => $::ceilometer::params::event_pipeline,
content => template('ceilometer/event_pipeline.yaml.erb'),
selinux_ignore_defaults => true,
mode => '0640',
owner => 'root',
group => 'ceilometer',
tag => 'ceilometer-yamls',
}
}
@ -145,6 +148,9 @@ class ceilometer::agent::notification (
path => $::ceilometer::params::pipeline,
content => template('ceilometer/pipeline.yaml.erb'),
selinux_ignore_defaults => true,
mode => '0640',
owner => 'root',
group => 'ceilometer',
tag => 'ceilometer-yamls',
}
}

8
spec/classes/ceilometer_agent_notification_spec.rb
View File

@ -117,7 +117,10 @@ describe 'ceilometer::agent::notification' do
) }
it { is_expected.to contain_file('event_pipeline').with(
'path' => '/etc/ceilometer/event_pipeline.yaml',
'path' => '/etc/ceilometer/event_pipeline.yaml',
'owner' => 'root',
'group' => 'ceilometer',
'mode' => '0640',
) }
it { 'configures event_pipeline with the default notifier'
@ -177,6 +180,9 @@ describe 'ceilometer::agent::notification' do
it { is_expected.to contain_file('pipeline').with(
'path' => '/etc/ceilometer/pipeline.yaml',
'mode' => '0640',
'owner' => 'root',
'group' => 'ceilometer',
) }
end