From 3ffc5a263113232230b69e621e1b6167f2148390 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 16 Oct 2014 15:20:41 -0400 Subject: [PATCH] migraton/libvirt: fix dependency cycle In the last commit, I introduced a dependency cyle: (File_line[/etc/sysconfig/libvirtd libvirtd args] => Service[libvirt] => Class[Nova::Compute::Libvirt] => File_line[/etc/sysconfig/libvirtd libvirtd args]) The "require" is useless, since the migration class is called by nova::compute::libvirt, let's delete it. Change-Id: I97aeb9dcc11bb867e020826ad9ed5d7d0e04a8e8 --- manifests/migration/libvirt.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index 6c861aca3..6ee441f42 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -34,7 +34,6 @@ class nova::migration::libvirt { line => 'LIBVIRTD_ARGS="--listen"', match => 'LIBVIRTD_ARGS=', notify => Service['libvirt'], - require => Class['nova::compute::libvirt'], } Package['libvirt'] -> File_line<| path == '/etc/sysconfig/libvirtd' |> @@ -66,7 +65,6 @@ class nova::migration::libvirt { line => 'libvirtd_opts="-d -l"', match => 'libvirtd_opts=', notify => Service['libvirt'], - require => Class['nova::compute::libvirt'], } Package['libvirt'] -> File_line<| path == "/etc/default/${::nova::compute::libvirt::libvirt_service_name}" |>