Merge "Update virsh secret if rbd_keyring or libvirt_rbd_secret_uuid change" into stable/mitaka

Author: Jenkins

manifests/compute/rbd.pp

@@ -102,7 +102,7 @@
 
     exec { 'get-or-set virsh secret':
       command => '/usr/bin/virsh secret-define --file /etc/nova/secret.xml | /usr/bin/awk \'{print $2}\' | sed \'/^$/d\' > /etc/nova/virsh.secret',
-      creates => '/etc/nova/virsh.secret',
+      unless  => "/usr/bin/virsh secret-list | grep ${libvirt_rbd_secret_uuid}",
       require => [File['/etc/nova/secret.xml'], Service['libvirt']],
     }
 
@@ -113,7 +113,7 @@
     }
     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}",
+      unless  => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid} | grep ${libvirt_key}",
       require => Exec['get-or-set virsh secret'],
       before  => Anchor['nova::config::end'],
     }

spec/classes/nova_compute_rbd_spec.rb

@@ -89,7 +89,7 @@
         ])
         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',
-          :creates => '/etc/nova/virsh.secret',
+          :unless  => '/usr/bin/virsh secret-list | grep UUID',
           :require => ['File[/etc/nova/secret.xml]', 'Service[libvirt]'],
         )
         is_expected.to contain_exec('set-secret-value virsh').with(
@@ -140,7 +140,7 @@
         ])
         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',
-          :creates => '/etc/nova/virsh.secret',
+          :unless  => '/usr/bin/virsh secret-list | grep UUID',
           :require => ['File[/etc/nova/secret.xml]', 'Service[libvirt]'],
         )
         is_expected.to contain_exec('set-secret-value virsh').with(