From c15e37c4246a7f8922e3a172419490c134c258d9 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 5 Jun 2020 10:41:30 +0200
Subject: [PATCH] Fix dependency cycle

There is a dependency cycle when using the nova::compute::libvirt
class and the nova::compute::rbd class in the same manifest.

The 'set-secret-value virsh' resource says before the
nova::config::end resource but up it's dependency path the
new libvirtd-tcp sources introduced in [1] depends requires
the nova::config::end anchor.

This removes the before nova::config::end on the set-secret-value
resources and only makes it depend on the get-or-set resource.

2020-06-05 08:26:58.966645 | centos-8 | (Anchor[nova::config::end] =>
Service[libvirtd-tcp] => Service[libvirt] => Exec[get-or-set virsh
secret] => Exec[set-secret-value virsh] =>
Anchor[nova::config::end])\nTry the '--graph' option and opening the
resulting '.dot' file in OmniGraffle or GraphViz

[1] https://review.opendev.org/#/c/730689/

Change-Id: Iab96968de75d7064b3aecf266d0f24b7b98dc809
(cherry picked from commit 345fac687a01075350fc057473dc042734024b04)
(cherry picked from commit e9931d92c90b94611e76c90bdf70bffb29fba68c)
---
 manifests/compute/rbd.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 19dc7fbef..5e74f2691 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -121,7 +121,6 @@ class nova::compute::rbd (
       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'],
-      before  => Anchor['nova::config::end'],
     }
   }