stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #562 from enovance/sbadia/feature/block_migration

Browse Source 
compute/hypervisor: Update libvirtd flags for block_migrations
This commit is contained in:
Emilien Macchi
2014-08-06 09:53:37 +02:00
parent 70f99aec3b 026916cb4c
commit 93b5fc4da6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute/hypervisor.pp
View File

@@ -225,6 +225,7 @@ Host *
'libvirt/inject_key': value => false; 'libvirt/inject_key': value => false;
'libvirt/inject_partition': value => '-2'; 'libvirt/inject_partition': value => '-2';
'libvirt/live_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST'; 'libvirt/live_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST';
'libvirt/block_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_DOMAIN_BLOCK_REBASE_COPY,VIR_DOMAIN_BLOCK_REBASE_SHALLOW';
} }
class { 'ceilometer::agent::compute': } class { 'ceilometer::agent::compute': }

1
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -250,6 +250,7 @@ describe 'cloud::compute::hypervisor' do
should contain_nova_config('libvirt/inject_key').with('value' => false) should contain_nova_config('libvirt/inject_key').with('value' => false)
should contain_nova_config('libvirt/inject_partition').with('value' => '-2') should contain_nova_config('libvirt/inject_partition').with('value' => '-2')
should contain_nova_config('libvirt/live_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST') should contain_nova_config('libvirt/live_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST')
should contain_nova_config('libvirt/block_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_DOMAIN_BLOCK_REBASE_COPY,VIR_DOMAIN_BLOCK_REBASE_SHALLOW')
end end
context 'with dbus on Ubuntu' do context 'with dbus on Ubuntu' do