Browse Source

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 345fac687a)
(cherry picked from commit e9931d92c9)
tags/15.6.0
Tobias Urdin 4 weeks ago
parent
commit
c15e37c424
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      manifests/compute/rbd.pp

+ 0
- 1
manifests/compute/rbd.pp View File

@@ -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'],
}
}



Loading…
Cancel
Save