diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp index 6457f4e0b..c00801d51 100644 --- a/manifests/compute/rbd.pp +++ b/manifests/compute/rbd.pp @@ -154,9 +154,10 @@ class nova::compute::rbd ( $libvirt_key = "$(ceph auth get-key ${rbd_keyring})" } exec { 'set-secret-value virsh': - command => "/usr/bin/virsh secret-set-value --secret ${libvirt_rbd_secret_uuid} --base64 ${libvirt_key}", - unless => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid} | grep ${libvirt_key}", - require => Exec['get-or-set virsh secret'], + command => "/usr/bin/virsh secret-set-value --secret ${libvirt_rbd_secret_uuid} --base64 ${libvirt_key}", + unless => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid} | grep ${libvirt_key}", + logoutput => false, + require => Exec['get-or-set virsh secret'], } } else { nova_config { diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb index 4044a6c48..9d5bf5fc5 100644 --- a/spec/classes/nova_compute_rbd_spec.rb +++ b/spec/classes/nova_compute_rbd_spec.rb @@ -98,7 +98,8 @@ describe 'nova::compute::rbd' do :require => 'File[/etc/nova/secret.xml]', ) is_expected.to contain_exec('set-secret-value virsh').with( - :command => "/usr/bin/virsh secret-set-value --secret UUID --base64 $(ceph auth get-key client.rbd_test)" + :command => "/usr/bin/virsh secret-set-value --secret UUID --base64 $(ceph auth get-key client.rbd_test)", + :logoutput => false, ) end end @@ -113,7 +114,8 @@ describe 'nova::compute::rbd' do it 'set libvirt secret key from passed key' do is_expected.to contain_exec('set-secret-value virsh').with( - :command => "/usr/bin/virsh secret-set-value --secret #{params[:libvirt_rbd_secret_uuid]} --base64 #{params[:libvirt_rbd_secret_key]}" + :command => "/usr/bin/virsh secret-set-value --secret #{params[:libvirt_rbd_secret_uuid]} --base64 #{params[:libvirt_rbd_secret_key]}", + :logoutput => false, ) end end @@ -152,7 +154,8 @@ describe 'nova::compute::rbd' do :require => 'File[/etc/nova/secret.xml]', ) is_expected.to contain_exec('set-secret-value virsh').with( - :command => "/usr/bin/virsh secret-set-value --secret UUID --base64 $(ceph auth get-key client.rbd_test)" + :command => "/usr/bin/virsh secret-set-value --secret UUID --base64 $(ceph auth get-key client.rbd_test)", + :logoutput => false, ) end end