Drop user/group for ceilometer

Packages will ensure these, and libvirt/nova group is not required for
ceilometer polling running.

Change-Id: I81ba165593c161afca201c8db5a46c06c3159f93
This commit is contained in:
Shi Yan 2022-05-12 13:17:58 +10:00
parent a569c41855
commit 7f05a4ebca
4 changed files with 0 additions and 52 deletions

View File

@ -107,20 +107,9 @@ class ceilometer::agent::polling (
}
if $compute_namespace {
if $::ceilometer::params::libvirt_group {
User['ceilometer'] {
groups => ['nova', $::ceilometer::params::libvirt_group]
}
Package <| title == 'libvirt' |> -> User['ceilometer']
} else {
User['ceilometer'] {
groups => ['nova']
}
}
$compute_namespace_name = 'compute'
Package <| title == 'ceilometer-common' |> -> User['ceilometer']
Package <| title == 'nova-common' |> -> Package['ceilometer-common']
ceilometer_config {

View File

@ -419,20 +419,6 @@ class ceilometer(
$snmpd_readonly_username_real = pick($snmpd_readonly_username, $::os_service_default)
$snmpd_readonly_user_password_real = pick($snmpd_readonly_user_password, $::os_service_default)
group { 'ceilometer':
ensure => present,
name => 'ceilometer',
require => Anchor['ceilometer::install::end'],
}
user { 'ceilometer':
ensure => present,
name => 'ceilometer',
gid => 'ceilometer',
system => true,
require => Anchor['ceilometer::install::end'],
}
package { 'ceilometer-common':
ensure => $package_ensure,
name => $::ceilometer::params::common_package_name,

View File

@ -17,14 +17,6 @@ describe 'ceilometer::agent::polling' do
it { should contain_class('ceilometer::deps') }
it { should contain_class('ceilometer::params') }
it {
if platform_params[:libvirt_group]
should contain_user('ceilometer').with_groups(['nova', "#{platform_params[:libvirt_group]}"])
else
should contain_user('ceilometer').with_groups(['nova'])
end
}
it { should contain_package('nova-common').with(
:before => /Package\[ceilometer-common\]/
)}
@ -285,7 +277,6 @@ sources:
{
:agent_package_name => 'ceilometer-polling',
:agent_service_name => 'ceilometer-polling',
:libvirt_group => 'libvirt'
}
when 'RedHat'
{

View File

@ -59,24 +59,6 @@ describe 'ceilometer' do
it { is_expected.to contain_class('ceilometer::params') }
it 'configures ceilometer group' do
is_expected.to contain_group('ceilometer').with(
:ensure => 'present',
:name => 'ceilometer',
:require => 'Anchor[ceilometer::install::end]'
)
end
it 'configures ceilometer user' do
is_expected.to contain_user('ceilometer').with(
:ensure => 'present',
:name => 'ceilometer',
:gid => 'ceilometer',
:system => true,
:require => 'Anchor[ceilometer::install::end]'
)
end
it 'installs ceilometer common package' do
is_expected.to contain_package('ceilometer-common').with(
:ensure => 'present',