openstack/puppet-nova
Code Issues Proposed changes

Fix missing dependency between qemu.conf and virtqemud

Browse Source 
This change fixes the missing notification from qemu.conf and virtqemud
so that the daemon is restarted to reload the updated configuration.

Change-Id: Ib99872ae757ba680ef3445033ab13b0af645f40c
This commit is contained in:
Takashi Kajinami 2022-06-25 23:56:30 +09:00
parent 4466f7cde6
commit 6849e6dec7
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute/libvirt/qemu.pp
View File

@ -71,7 +71,7 @@ class nova::compute::libvirt::qemu(
-> Anchor['nova::config::end']
Augeas<| tag == 'qemu-conf-augeas'|>
~> Service['libvirt']
~> Service<| tag == 'libvirt-qemu-service' |>
if $configure_qemu {

4
manifests/compute/libvirt/services.pp
View File

@ -105,7 +105,7 @@ class nova::compute::libvirt::services (
ensure => $libvirt_service_ensure,
enable => $libvirt_service_enable,
name => $libvirt_service_name,
tag => 'libvirt-service',
tag => ['libvirt-service', 'libvirt-qemu-service'],
}
Libvirtd_config<||> ~> Service['libvirt']
@ -196,7 +196,7 @@ class nova::compute::libvirt::services (
ensure => running,
enable => true,
name => $virtqemu_service_name,
tag => ['libvirt-service', 'libvirt-modular-service'],
tag => ['libvirt-service', 'libvirt-qemu-service', 'libvirt-modular-service'],
}
Virtqemud_config<||> ~> Service['virtlogd']
}

2
manifests/migration/qemu.pp
View File

@ -29,7 +29,7 @@ class nova::migration::qemu(
-> Anchor['nova::config::end']
Augeas<| tag == 'qemu-conf-augeas'|>
~> Service['libvirt']
~> Service<| tag == 'libvirt-qemu-service' |>
if $configure_qemu {

18
spec/classes/nova_compute_libvirt_qemu_spec.rb
View File

@ -28,7 +28,7 @@ describe 'nova::compute::libvirt::qemu' do
"rm memory_backing_dir",
"rm nbd_tls",
],
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu by default' do
@ -48,7 +48,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with overridden parameters' do
@ -70,7 +70,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with group parameter' do
@ -96,7 +96,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with vnc_tls' do
@ -117,7 +117,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with default_tls_verify enabled' do
@ -138,7 +138,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with vnc_tls_verify disabled' do
@ -160,7 +160,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with default_tls_verify disabled' do
@ -181,7 +181,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 0",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with nbd_tls and libvirt >= 4.5' do
@ -202,7 +202,7 @@ describe 'nova::compute::libvirt::qemu' do
"set nbd_tls 1",
],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
end

6
spec/classes/nova_migration_qemu_spec.rb
View File

@ -19,7 +19,7 @@ describe 'nova::migration::qemu' do
it { is_expected.to contain_augeas('qemu-conf-migration-ports').with({
:context => '/files/etc/libvirt/qemu.conf',
:changes => [ "rm migration_port_min", "rm migration_port_max" ],
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu by default' do
@ -32,7 +32,7 @@ describe 'nova::migration::qemu' do
:context => '/files/etc/libvirt/qemu.conf',
:changes => [ "set migration_port_min 49152", "set migration_port_max 49215" ],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
context 'when configuring qemu with overridden parameters' do
@ -47,7 +47,7 @@ describe 'nova::migration::qemu' do
:context => '/files/etc/libvirt/qemu.conf',
:changes => [ "set migration_port_min 61138", "set migration_port_max 61200" ],
:tag => 'qemu-conf-augeas',
}).that_notifies('Service[libvirt]') }
}) }
end
end