openstack/puppet-nova
Code Issues Proposed changes

Merge "Purge [libvirt] rbd_secret_uuid when unused"

Browse Source
This commit is contained in:
Zuul
2022-06-20 19:31:35 +00:00
committed by Gerrit Code Review
parent 72109eaf9a dcb5d932ec
commit 4466f7cde6
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/rbd.pp
View File

@@ -143,6 +143,10 @@ class nova::compute::rbd (
unless => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid} | grep ${libvirt_key}", unless => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid} | grep ${libvirt_key}",
require => Exec['get-or-set virsh secret'], require => Exec['get-or-set virsh secret'],
} }
} else {
nova_config {
'libvirt/rbd_secret_uuid': ensure => absent;
}
} }
if $ephemeral_storage { if $ephemeral_storage {

1
spec/classes/nova_compute_rbd_spec.rb
View File

@@ -31,6 +31,7 @@ describe 'nova::compute::rbd' do
it { is_expected.to contain_class('nova::params') } it { is_expected.to contain_class('nova::params') }
it 'configure nova.conf with default parameters' do it 'configure nova.conf with default parameters' do
is_expected.to contain_nova_config('libvirt/rbd_secret_uuid').with_ensure('absent')
is_expected.to contain_nova_config('libvirt/images_rbd_pool').with_value('rbd') is_expected.to contain_nova_config('libvirt/images_rbd_pool').with_value('rbd')
is_expected.to contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/etc/ceph/ceph.conf') is_expected.to contain_nova_config('libvirt/images_rbd_ceph_conf').with_value('/etc/ceph/ceph.conf')
is_expected.to contain_nova_config('libvirt/rbd_user').with_value('nova') is_expected.to contain_nova_config('libvirt/rbd_user').with_value('nova')