stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #630 from enovance/bug/blockmigration/sbadia

Browse Source 
compute/hypervisor: Fix block_migration_flag
This commit is contained in:
Emilien Macchi 2014-09-21 21:29:19 -04:00
commit 3773dc4c1d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/compute/hypervisor.pp
View File

@ -33,7 +33,6 @@
# (optional) Allow to manage or not TSO issue. # (optional) Allow to manage or not TSO issue.
# Default to true. # Default to true.
# #
class cloud::compute::hypervisor( class cloud::compute::hypervisor(
$server_proxyclient_address = '127.0.0.1', $server_proxyclient_address = '127.0.0.1',
$libvirt_type = 'kvm', $libvirt_type = 'kvm',
@ -260,7 +259,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'; 'libvirt/block_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC';
} }
class { 'ceilometer::agent::compute': } class { 'ceilometer::agent::compute': }

2
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -243,7 +243,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') should contain_nova_config('libvirt/block_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC')
end end
context 'with dbus on Ubuntu' do context 'with dbus on Ubuntu' do