openstack/puppet-nova
Code Issues Proposed changes

Use more specific name for daemon-reload command

Browse Source 
... to avoid conflict with the other modules. Also fix the typo of
daemon.

Change-Id: I7f9abcbafa97ed5d542b5ac4166f7fea0b5b5ffb
This commit is contained in:
Takashi Kajinami
2024-10-05 18:47:26 +09:00
parent 4ce92dd2ed
commit de3a8a91e3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/migration/libvirt.pp
View File

@@ -383,7 +383,7 @@ class nova::migration::libvirt(
file { "/etc/systemd/system/${socket_name}.socket": file { "/etc/systemd/system/${socket_name}.socket":
ensure => absent, ensure => absent,
require => Anchor['nova::install::end'] require => Anchor['nova::install::end']
} ~> exec { 'systemd-damon-reload': } ~> exec { 'libvirt-socket-daemon-reload':
command => 'systemctl daemon-reload', command => 'systemctl daemon-reload',
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'], path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
refreshonly => true, refreshonly => true,
@@ -410,16 +410,16 @@ class nova::migration::libvirt(
path => "/etc/systemd/system/${socket_name}.socket", path => "/etc/systemd/system/${socket_name}.socket",
line => "ListenStream=${listen_address_real}:${listen_port}", line => "ListenStream=${listen_address_real}:${listen_port}",
match => '^ListenStream=.*', match => '^ListenStream=.*',
} ~> exec { 'systemd-damon-reload': } ~> exec { 'libvirt-socket-daemon-reload':
command => 'systemctl daemon-reload', command => 'systemctl daemon-reload',
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'], path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
refreshonly => true, refreshonly => true,
} ~> Service[$socket_name] } ~> Service[$socket_name]
File["/etc/systemd/system/${socket_name}.socket"] ~> Exec['systemd-damon-reload'] File["/etc/systemd/system/${socket_name}.socket"] ~> Exec['libvirt-socket-daemon-reload']
} }
# We have to stop libvirtd.service to restart socket. # We have to stop libvirtd.service to restart socket.
Exec['systemd-damon-reload'] ~> Exec["stop ${proxy_service}.service"] Exec['libvirt-socket-daemon-reload'] ~> Exec["stop ${proxy_service}.service"]
if $modular_libvirt { if $modular_libvirt {
Service["${proxy_service}-${transport}"] -> Service<| title == 'virtproxyd' |> Service["${proxy_service}-${transport}"] -> Service<| title == 'virtproxyd' |>

2
releasenotes/notes/libvirt-daemon-1cfe1bd9f29708fe.yaml
View File

@@ -2,6 +2,6 @@
features: features:
- | - |
The ``nova::compute::libvirt::services`` class now installs The ``nova::compute::libvirt::services`` class now installs
the ``libvirt-damon`` package explicitly in CentOS and RHEL when modular the ``libvirt-daemon`` package explicitly in CentOS and RHEL when modular
libvirt daemons are not used. This is required in recent CentOS Stream 9 libvirt daemons are not used. This is required in recent CentOS Stream 9
to use legacy libvirtd service and socket. to use legacy libvirtd service and socket.