Drop management of dbus service
The dbus service is fundamental in CentOS/RHEL systems and we can assume the service is always running. Change-Id: I7775effaed6d7b476131675ee8ccdfd0a99cdff9
This commit is contained in:
parent
8d88b7bf4f
commit
4032b105fe
|
@ -148,19 +148,6 @@ class nova::compute::libvirt::services (
|
||||||
tag => ['libvirt-service', 'libvirt-qemu-service'],
|
tag => ['libvirt-service', 'libvirt-qemu-service'],
|
||||||
}
|
}
|
||||||
Libvirtd_config<||> ~> Service['libvirt']
|
Libvirtd_config<||> ~> Service['libvirt']
|
||||||
|
|
||||||
# messagebus
|
|
||||||
if( $facts['os']['family'] == 'RedHat') {
|
|
||||||
# NOTE(tkajinam): Do not use libvirt-service tag to avoid unnecessary
|
|
||||||
# restart.
|
|
||||||
service { 'messagebus':
|
|
||||||
ensure => running,
|
|
||||||
enable => true,
|
|
||||||
name => $::nova::params::messagebus_service_name,
|
|
||||||
require => Anchor['nova::service::begin'],
|
|
||||||
before => Anchor['nova::service::end'],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $virtlock_service_name {
|
if $virtlock_service_name {
|
||||||
|
@ -184,8 +171,6 @@ class nova::compute::libvirt::services (
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! $modular_libvirt {
|
if ! $modular_libvirt {
|
||||||
Service<| title == 'messagebus' |> -> Service<| title == 'libvirt' |>
|
|
||||||
|
|
||||||
Service<| title == 'virtlogd' |>
|
Service<| title == 'virtlogd' |>
|
||||||
-> Service<| title == 'libvirt' |>
|
-> Service<| title == 'libvirt' |>
|
||||||
-> Service<| title == 'nova-compute'|>
|
-> Service<| title == 'nova-compute'|>
|
||||||
|
@ -202,8 +187,6 @@ class nova::compute::libvirt::services (
|
||||||
# NOTE(tkajinam): libvirt should be stopped before starting modular daemons
|
# NOTE(tkajinam): libvirt should be stopped before starting modular daemons
|
||||||
Service<| title == 'libvirt' |> -> Service<| tag == 'libvirt-modular-service' |>
|
Service<| title == 'libvirt' |> -> Service<| tag == 'libvirt-modular-service' |>
|
||||||
|
|
||||||
Service<| title == 'messagebus' |> -> Service<| tag == 'libvirt-modular-service' |>
|
|
||||||
|
|
||||||
Service<| title == 'virtlogd' |>
|
Service<| title == 'virtlogd' |>
|
||||||
-> Service<| tag == 'libvirt-modular-service' |>
|
-> Service<| tag == 'libvirt-modular-service' |>
|
||||||
-> Service<| title == 'nova-compute'|>
|
-> Service<| title == 'nova-compute'|>
|
||||||
|
|
|
@ -68,7 +68,6 @@ class nova::params {
|
||||||
$nova_wsgi_script_path = '/var/www/cgi-bin/nova'
|
$nova_wsgi_script_path = '/var/www/cgi-bin/nova'
|
||||||
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
|
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
|
||||||
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi'
|
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi'
|
||||||
$messagebus_service_name = 'dbus'
|
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
# package names
|
# package names
|
||||||
|
|
|
@ -255,7 +255,6 @@ describe 'nova::compute::libvirt' do
|
||||||
it { is_expected.not_to contain_package('libvirt') }
|
it { is_expected.not_to contain_package('libvirt') }
|
||||||
it { is_expected.not_to contain_service('libvirt') }
|
it { is_expected.not_to contain_service('libvirt') }
|
||||||
it { is_expected.not_to contain_package('libvirt-nwfilter') }
|
it { is_expected.not_to contain_package('libvirt-nwfilter') }
|
||||||
it { is_expected.not_to contain_service('messagebus') }
|
|
||||||
it { is_expected.not_to contain_service('virtlockd') }
|
it { is_expected.not_to contain_service('virtlockd') }
|
||||||
it { is_expected.not_to contain_service('virtlogd') }
|
it { is_expected.not_to contain_service('virtlogd') }
|
||||||
end
|
end
|
||||||
|
@ -285,12 +284,6 @@ describe 'nova::compute::libvirt' do
|
||||||
:ensure => 'running',
|
:ensure => 'running',
|
||||||
:before => ['Anchor[nova::service::end]', 'Service[nova-compute]'],
|
:before => ['Anchor[nova::service::end]', 'Service[nova-compute]'],
|
||||||
)}
|
)}
|
||||||
it { is_expected.to contain_service('messagebus').with(
|
|
||||||
:ensure => 'running',
|
|
||||||
:enable => true,
|
|
||||||
:before => ['Anchor[nova::service::end]', 'Service[libvirt]'],
|
|
||||||
:name => 'dbus'
|
|
||||||
) }
|
|
||||||
|
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
|
it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
|
||||||
it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
|
it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
|
||||||
|
@ -362,7 +355,6 @@ describe 'nova::compute::libvirt' do
|
||||||
it { is_expected.not_to contain_package('libvirt') }
|
it { is_expected.not_to contain_package('libvirt') }
|
||||||
it { is_expected.not_to contain_service('libvirt') }
|
it { is_expected.not_to contain_service('libvirt') }
|
||||||
it { is_expected.not_to contain_package('libvirt-nwfilter') }
|
it { is_expected.not_to contain_package('libvirt-nwfilter') }
|
||||||
it { is_expected.not_to contain_service('messagebus') }
|
|
||||||
it { is_expected.not_to contain_service('virtlockd') }
|
it { is_expected.not_to contain_service('virtlockd') }
|
||||||
it { is_expected.not_to contain_service('virtlogd') }
|
it { is_expected.not_to contain_service('virtlogd') }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue