From 016c9e8142ff30fcb3ab9810360d5eba28b57517 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 18 Mar 2016 18:36:29 +0300 Subject: [PATCH] Fix libvirt_uuid file generation When libvirt_uuid file is created, it requires /etc/libvirt directory which is added by libvirt package. So the package should be required Change-Id: Id290fff5c6c7c78916b9f878ad04928b2ea46c82 --- manifests/migration/libvirt.pp | 3 ++- spec/classes/nova_migration_libvirt_spec.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index a85e8e60d..6fbbea625 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -71,7 +71,8 @@ class nova::migration::libvirt( if ! $::libvirt_uuid { $host_uuid = generate('/bin/cat', '/proc/sys/kernel/random/uuid') file { '/etc/libvirt/libvirt_uuid': - content => $host_uuid + content => $host_uuid, + require => Package['libvirt'], } } else { $host_uuid = $::libvirt_uuid diff --git a/spec/classes/nova_migration_libvirt_spec.rb b/spec/classes/nova_migration_libvirt_spec.rb index f1db09526..0e8864349 100644 --- a/spec/classes/nova_migration_libvirt_spec.rb +++ b/spec/classes/nova_migration_libvirt_spec.rb @@ -53,6 +53,10 @@ describe 'nova::migration::libvirt' do } end + it { is_expected.to contain_file('/etc/libvirt/libvirt_uuid').with({ + :content => '0000-111-111', + }).that_requires('Package[libvirt]') } + it { is_expected.to contain_augeas('libvirt-conf-uuid').with({ :context => '/files/etc/libvirt/libvirtd.conf', :changes => [ "set host_uuid 0000-111-111" ],