openstack
/
puppet-tripleo
Code Issues Proposed changes

Update nova::compute::libvirt for bug 1720787 

Nova compute was missed in the backporting of the related patch.
This resulted in the correct acls for the nova user not being applied.
This patch adds code missed in the backport of patch
https://review.openstack.org/#/c/517347/

Change-Id: I6f1b8f9fb410ac655c96cc9aab7f06e203cdc31b
Related-Bug: 1720787
This commit is contained in:
Keith Schincke 2018-01-25 07:06:30 -05:00
parent f8ff0d0b30
commit cbbf5bfa8c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/profile/base/nova/compute/libvirt.pp
View File

@ -18,12 +18,17 @@
#
# === Parameters
#
# [*nova_rbd_client_name*]
# (optional) name of RBD client
# defaults to hiera('nova::compute::rbd::libvirt_rbd_user')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::nova::compute::libvirt (
$nova_rbd_client_name = hiera('nova::compute::rbd::libvirt_rbd_user','openstack'),
$step = hiera('step'),
) {
if $step >= 4 {
@ -38,6 +43,12 @@ class tripleo::profile::base::nova::compute::libvirt (
class { '::nova::compute::rbd':
libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
}
exec{ "exec-setfacl-${nova_rbd_client_name}-nova":
path => ['/bin', '/usr/bin'],
command => "setfacl -m u:nova:r-- /etc/ceph/ceph.client.${nova_rbd_client_name}.keyring",
unless => "getfacl /etc/ceph/ceph.client.${nova_rbd_client_name}.keyring | grep -q user:nova:r--",
}
Ceph::Key<| title == "client.${nova_rbd_client_name}" |> -> Exec["exec-setfacl-${nova_rbd_client_name}-nova"]
}
if $rbd_ephemeral_storage {