diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp index 44b201f0e..82cb3f321 100644 --- a/manifests/compute/rbd.pp +++ b/manifests/compute/rbd.pp @@ -107,7 +107,7 @@ class nova::compute::rbd ( $cm = '/usr/bin/virsh secret-define --file /etc/nova/secret.xml | /usr/bin/awk \'{print $2}\' | sed \'/^$/d\' > /etc/nova/virsh.secret' exec { 'get-or-set virsh secret': command => $cm, - unless => "/usr/bin/virsh secret-list | grep ${libvirt_rbd_secret_uuid}", + unless => "/usr/bin/virsh secret-list | grep -i ${libvirt_rbd_secret_uuid}", require => [File['/etc/nova/secret.xml'], Service['libvirt']], } diff --git a/releasenotes/notes/virsh-secret-uuid-c1e4c39473d45300.yaml b/releasenotes/notes/virsh-secret-uuid-c1e4c39473d45300.yaml new file mode 100644 index 000000000..a2521aeac --- /dev/null +++ b/releasenotes/notes/virsh-secret-uuid-c1e4c39473d45300.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Case insensitive 'libvirt_rbd_secret_uuid' option for nova compute rbd. diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb index ae816349b..b4a41ee4d 100644 --- a/spec/classes/nova_compute_rbd_spec.rb +++ b/spec/classes/nova_compute_rbd_spec.rb @@ -89,7 +89,7 @@ describe 'nova::compute::rbd' do ]) is_expected.to contain_exec('get-or-set virsh secret').with( :command => '/usr/bin/virsh secret-define --file /etc/nova/secret.xml | /usr/bin/awk \'{print $2}\' | sed \'/^$/d\' > /etc/nova/virsh.secret', - :unless => '/usr/bin/virsh secret-list | grep UUID', + :unless => '/usr/bin/virsh secret-list | grep -i UUID', :require => ['File[/etc/nova/secret.xml]', 'Service[libvirt]'], ) is_expected.to contain_exec('set-secret-value virsh').with( @@ -140,7 +140,7 @@ describe 'nova::compute::rbd' do ]) is_expected.to contain_exec('get-or-set virsh secret').with( :command => '/usr/bin/virsh secret-define --file /etc/nova/secret.xml | /usr/bin/awk \'{print $2}\' | sed \'/^$/d\' > /etc/nova/virsh.secret', - :unless => '/usr/bin/virsh secret-list | grep UUID', + :unless => '/usr/bin/virsh secret-list | grep -i UUID', :require => ['File[/etc/nova/secret.xml]', 'Service[libvirt]'], ) is_expected.to contain_exec('set-secret-value virsh').with(