openstack/puppet-nova
Code Issues Proposed changes

Merge "Expose libvirt/hw_machine_type for consistent machine types."

Browse Source
This commit is contained in:
Jenkins 2016-11-19 01:06:08 +00:00 committed by Gerrit Code Review
commit b8a6667bbb
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute/libvirt.pp
View File

@ -45,6 +45,10 @@
# Qemu1.5 (raw format) Qemu1.6(qcow2 format).
# Defaults to $::os_service_default
#
# [*libvirt_hw_machine_type*]
# (optional) Option to specify a default machine type per host architecture.
# Defaults to $::os_service_default
#
# [*libvirt_inject_password*]
# (optional) Inject the admin password at boot time, without an agent.
# Defaults to false
@ -113,6 +117,7 @@ class nova::compute::libvirt (
$libvirt_cpu_model = undef,
$libvirt_disk_cachemodes = [],
$libvirt_hw_disk_discard = $::os_service_default,
$libvirt_hw_machine_type = $::os_service_default,
$libvirt_inject_password = false,
$libvirt_inject_key = false,
$libvirt_inject_partition = -2,
@ -189,6 +194,7 @@ class nova::compute::libvirt (
'libvirt/inject_key': value => $libvirt_inject_key;
'libvirt/inject_partition': value => $libvirt_inject_partition;
'libvirt/hw_disk_discard': value => $libvirt_hw_disk_discard;
'libvirt/hw_machine_type': value => $libvirt_hw_machine_type;
}
# cpu_model param is only valid if cpu_mode=custom

5
releasenotes/notes/add_libvirt_hw_machine_type_parameter-a385e959c6aea16d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- Add libvirt_hw_machine_type parameter to
nova::compute::libvirt to allow setting the
libvirt/hw_machine_type option in nova.conf

2
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -68,6 +68,7 @@ describe 'nova::compute::libvirt' do
:libvirt_cpu_model => 'kvm64',
:libvirt_disk_cachemodes => ['file=directsync','block=none'],
:libvirt_hw_disk_discard => 'unmap',
:libvirt_hw_machine_type => 'x86_64=machinetype1,armv7l=machinetype2',
:remove_unused_base_images => true,
:remove_unused_resized_minimum_age_seconds => 3600,
:remove_unused_original_minimum_age_seconds => 3600,
@ -88,6 +89,7 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/cpu_model').with_ensure('absent')}
it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_value('file=directsync,block=none')}
it { is_expected.to contain_nova_config('libvirt/hw_disk_discard').with_value('unmap')}
it { is_expected.to contain_nova_config('libvirt/hw_machine_type').with_value('x86_64=machinetype1,armv7l=machinetype2')}
it { is_expected.to contain_nova_config('vnc/vncserver_listen').with_value('0.0.0.0')}
it { is_expected.to contain_nova_config('DEFAULT/remove_unused_base_images').with_value(true)}
it { is_expected.to contain_nova_config('DEFAULT/remove_unused_original_minimum_age_seconds').with_value(3600)}