openstack/puppet-nova
Code Issues Proposed changes

Fix libvirt_uuid file generation

Browse Source 
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
This commit is contained in:
Sergey Kolekonov
2016-03-18 18:36:29 +03:00
parent 40a62aba41
commit 016c9e8142
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/migration/libvirt.pp
View File

@@ -71,7 +71,8 @@ class nova::migration::libvirt(
if ! $::libvirt_uuid { if ! $::libvirt_uuid {
$host_uuid = generate('/bin/cat', '/proc/sys/kernel/random/uuid') $host_uuid = generate('/bin/cat', '/proc/sys/kernel/random/uuid')
file { '/etc/libvirt/libvirt_uuid': file { '/etc/libvirt/libvirt_uuid':
content => $host_uuid content => $host_uuid,
require => Package['libvirt'],
} }
} else { } else {
$host_uuid = $::libvirt_uuid $host_uuid = $::libvirt_uuid

4
spec/classes/nova_migration_libvirt_spec.rb
View File

@@ -53,6 +53,10 @@ describe 'nova::migration::libvirt' do
} }
end 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({ it { is_expected.to contain_augeas('libvirt-conf-uuid').with({
:context => '/files/etc/libvirt/libvirtd.conf', :context => '/files/etc/libvirt/libvirtd.conf',
:changes => [ "set host_uuid 0000-111-111" ], :changes => [ "set host_uuid 0000-111-111" ],