openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Use file resource to create the socket file"

This commit is contained in:
Zuul 2023-04-03 01:09:08 +00:00 committed by Gerrit Code Review
parent 4d4804913d eb25744a11
commit bf108ee3f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/migration/libvirt.pp
View File

@ -376,10 +376,10 @@ class nova::migration::libvirt(
# TODO(tkajinam): We have to completely override the socket file,
# because dropin does not allow us to remove
# ListenStream in the base file.
exec { "create ${socket_name}.socket":
command => "cp /usr/lib/systemd/system/${socket_name}.socket /etc/systemd/system/",
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
creates => "/etc/systemd/system/${socket_name}.socket",
file { "/etc/systemd/system/${socket_name}.socket":
mode => '0644',
source => "/usr/lib/systemd/system/${socket_name}.socket",
replace => false,
require => Anchor['nova::install::end'],
} -> file_line { "${proxy_service}-${transport_real}.socket ListenStream":
path => "/etc/systemd/system/${socket_name}.socket",
@ -390,7 +390,7 @@ class nova::migration::libvirt(
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
refreshonly => true,
} ~> Service[$socket_name]
Exec["create ${socket_name}.socket"] ~> Exec['systemd-damon-reload']
File["/etc/systemd/system/${socket_name}.socket"] ~> Exec['systemd-damon-reload']
}
# We have to stop libvirtd.service to restart socket.