openstack
/
puppet-nova
Code Issues Proposed changes

Fix editing /etc/default/libvirtd in Debian 

The current way things were setup, it was impossible to correctly
call nova::migration::libvirt to setup live migration over TLS.
Indeed, one has to call ::nova::compute::libvirt to set the
::nova::compute::libvirt::libvirt_service_name paramenter, however
this class has an include nova::migration::libvirt, which then
prevents calling ::nova::compute::libvirt with custom parameters.

Also, libvirtd is hard-coded in a few places in
::nova::migration::libvirt, and I see no reason why one would like
to override the /etc/default/libvirtd path.

Therefore, this patch replace the variable in:
/etc/default/::nova::compute::libvirt::libvirt_service_name
by the hard-coded value /etc/default/libvirtd which should be no
problem for anyone, making it now possible to configure OpenStack
to do libvirt native TLS migrations.

Change-Id: I48e9549f6ca0037c142d8bc8428349e6ac364bc5
This commit is contained in:
Thomas Goirand 2021-12-03 09:49:44 +01:00
parent 0ae125114a
commit 28270506eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/migration/libvirt.pp
View File

@ -362,8 +362,8 @@ class nova::migration::libvirt(
$libvirtd_opts = ''
}
file_line { "/etc/default/${::nova::compute::libvirt::libvirt_service_name} libvirtd opts":
path => "/etc/default/${::nova::compute::libvirt::libvirt_service_name}",
file_line { "/etc/default/libvirtd libvirtd opts":
path => "/etc/default/libvirtd",
line => "libvirtd_opts=${libvirtd_opts}",
match => 'libvirtd_opts=',
tag => 'libvirt-file_line',