diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp index 32c9b30b5..173937593 100644 --- a/manifests/compute/libvirt/services.pp +++ b/manifests/compute/libvirt/services.pp @@ -148,19 +148,6 @@ class nova::compute::libvirt::services ( tag => ['libvirt-service', 'libvirt-qemu-service'], } 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 { @@ -184,8 +171,6 @@ class nova::compute::libvirt::services ( } if ! $modular_libvirt { - Service<| title == 'messagebus' |> -> Service<| title == 'libvirt' |> - Service<| title == 'virtlogd' |> -> Service<| title == 'libvirt' |> -> Service<| title == 'nova-compute'|> @@ -202,8 +187,6 @@ class nova::compute::libvirt::services ( # NOTE(tkajinam): libvirt should be stopped before starting modular daemons Service<| title == 'libvirt' |> -> Service<| tag == 'libvirt-modular-service' |> - Service<| title == 'messagebus' |> -> Service<| tag == 'libvirt-modular-service' |> - Service<| title == 'virtlogd' |> -> Service<| tag == 'libvirt-modular-service' |> -> Service<| title == 'nova-compute'|> diff --git a/manifests/params.pp b/manifests/params.pp index d2d2e0b35..441636b94 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -68,7 +68,6 @@ class nova::params { $nova_wsgi_script_path = '/var/www/cgi-bin/nova' $nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi' $nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi' - $messagebus_service_name = 'dbus' } 'Debian': { # package names diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index a22f68d29..aaa85bc17 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -255,7 +255,6 @@ describe 'nova::compute::libvirt' do it { is_expected.not_to contain_package('libvirt') } it { is_expected.not_to contain_service('libvirt') } 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('virtlogd') } end @@ -285,12 +284,6 @@ describe 'nova::compute::libvirt' do :ensure => 'running', :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('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_service('libvirt') } 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('virtlogd') } end