Only add ceilometer user to nova group if using compute agent
When using ceilometer outside of the compute context (ex: with the swift middleware), puppet-ceilometer attempts to add the user to the nova group which does not (and probably should not) exist on the swift nodes. Change-Id: I6cc68152325a967c024ce611f92a90ce0afba8cc
This commit is contained in:
parent
f8eea90cd9
commit
d064997cd4
|
@ -22,7 +22,11 @@ class ceilometer::agent::compute (
|
|||
|
||||
if $::ceilometer::params::libvirt_group {
|
||||
User['ceilometer'] {
|
||||
groups +> [$::ceilometer::params::libvirt_group]
|
||||
groups => ['nova', $::ceilometer::params::libvirt_group]
|
||||
}
|
||||
} else {
|
||||
User['ceilometer'] {
|
||||
groups => ['nova']
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -89,7 +89,6 @@ class ceilometer(
|
|||
user { 'ceilometer':
|
||||
name => 'ceilometer',
|
||||
gid => 'ceilometer',
|
||||
groups => ['nova'],
|
||||
system => true,
|
||||
require => Package['ceilometer-common'],
|
||||
}
|
||||
|
|
|
@ -24,9 +24,11 @@ describe 'ceilometer::agent::compute' do
|
|||
)
|
||||
end
|
||||
|
||||
it 'adds ceilometer user to libvirt group if required' do
|
||||
it 'adds ceilometer user to nova group and, if required, to libvirt group' do
|
||||
if platform_params[:libvirt_group]
|
||||
should contain_user('ceilometer').with_groups(/#{platform_params[:libvirt_group]}/)
|
||||
should contain_user('ceilometer').with_groups(['nova', "#{platform_params[:libvirt_group]}"])
|
||||
else
|
||||
should contain_user('ceilometer').with_groups('nova')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -76,7 +76,6 @@ describe 'ceilometer' do
|
|||
should contain_user('ceilometer').with(
|
||||
:name => 'ceilometer',
|
||||
:gid => 'ceilometer',
|
||||
:groups => ['nova'],
|
||||
:system => true,
|
||||
:require => 'Package[ceilometer-common]'
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue