diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-08-22 18:14:22 +0000 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-08-24 12:30:08 +0000 |
commit | 347aa4a4f255372201affc3dc6c7e409ca7e76b8 (patch) | |
tree | 8cc0bcbcbb0009f30dc7a9a3948a877639ab505a /manifests/certmonger | |
parent | 92c04bbb77468214d2f1cba7c11f1de50fa6ad63 (diff) |
TLS-everywhere/libvirt: Make postsave command configurable
This is requires for when libvirt is running over a container, since
we shouldn't try to restart the libvirt process, but the container
itself.
bp tls-via-certmonger-containers
Change-Id: I26a7748b37059ea37f460d8c70ef684cc41b16d3
Diffstat (limited to 'manifests/certmonger')
-rw-r--r-- | manifests/certmonger/libvirt.pp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/manifests/certmonger/libvirt.pp b/manifests/certmonger/libvirt.pp index b7dbb0a..8ce0037 100644 --- a/manifests/certmonger/libvirt.pp +++ b/manifests/certmonger/libvirt.pp @@ -35,6 +35,11 @@ # (Optional) The user which the certificate and key files belong to. # Defaults to 'root' # +# [*postsave_cmd*] +# (Optional) Specifies the command to execute after requesting a certificate. +# If nothing is given, it will default to: "systemctl reload ${service name}" +# Defaults to undef. +# # [*principal*] # (Optional) The service principal that is set for the service in kerberos. # Defaults to undef @@ -44,12 +49,13 @@ define tripleo::certmonger::libvirt ( $service_certificate, $service_key, $certmonger_ca = hiera('certmonger_ca', 'local'), + $postsave_cmd = undef, $principal = undef, ) { include ::certmonger include ::nova::params - $postsave_cmd = "systemctl restart ${::nova::params::libvirt_service_name}" + $postsave_cmd_real = pick($postsave_cmd, "systemctl reload ${::nova::params::libvirt_service_name}") certmonger_certificate { $name : ensure => 'present', certfile => $service_certificate, @@ -57,7 +63,7 @@ define tripleo::certmonger::libvirt ( hostname => $hostname, dnsname => $hostname, principal => $principal, - postsave_cmd => $postsave_cmd, + postsave_cmd => $postsave_cmd_real, ca => $certmonger_ca, wait => true, tag => 'libvirt-cert', |