Align stars to fix ci
1) Pin fast_gettext
The fast_gettext gem 1.2.0 and greater require ruby 2.1 which we don't
have.
2) Pass a generic cpu to qemu instead of trying to pass host-model
We don't need to pass any CPU extensions in the gate, given the
context where we don't use KVM or (proper) nested virtualization.
Truthfully, this also becomes required as there are upcoming changes
in qemu-kvm 2.6.0 which breaks us when trying to pass extensions
while using qemu.
Worth noting that devstack has been setting 'none' [1] as well.
[1]: 1c442eebc8/lib/nova_plugins/hypervisor-libvirt (L42)
Change-Id: I881bd712266ae63b0ac9074ec18bd6a41b946c3a
This commit is contained in:
parent
a221d92cc3
commit
b93ecf8bff
1
Gemfile
1
Gemfile
@ -4,6 +4,7 @@ group :development, :test, :system_tests do
|
||||
gem 'puppet-openstack_spec_helper',
|
||||
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
|
||||
:require => false
|
||||
gem 'fast_gettext', ['< 1.2.0']
|
||||
end
|
||||
|
||||
if facterversion = ENV['FACTER_GEM_VERSION']
|
||||
|
@ -22,6 +22,8 @@ source $SCRIPT_DIR/functions
|
||||
|
||||
print_header 'Start (install_modules.sh)'
|
||||
print_header 'Install r10k'
|
||||
# fast_gettext 1.2.0+ requires ruby 2.1.0
|
||||
gem install fast_gettext -v '< 1.2.0'
|
||||
gem install r10k --no-ri --no-rdoc
|
||||
|
||||
# make sure there is no puppet module pre-installed
|
||||
|
@ -9,6 +9,11 @@
|
||||
# (optional) Libvirt domain type. Options are: kvm, lxc, qemu, uml, xen
|
||||
# Defaults to 'qemu'
|
||||
#
|
||||
# [*libvirt_cpu_mode*]
|
||||
# (optional) The libvirt CPU mode to configure.
|
||||
# Possible values include custom, host-model, none, host-passthrough.
|
||||
# Defaults to 'none'
|
||||
#
|
||||
# [*volume_encryption*]
|
||||
# (optional) Boolean to configure or not volume encryption
|
||||
# Defaults to false.
|
||||
@ -16,6 +21,7 @@
|
||||
class openstack_integration::nova (
|
||||
$libvirt_rbd = false,
|
||||
$libvirt_virt_type = 'qemu',
|
||||
$libvirt_cpu_mode = 'none',
|
||||
$volume_encryption = false,
|
||||
) {
|
||||
|
||||
@ -121,6 +127,7 @@ class openstack_integration::nova (
|
||||
}
|
||||
class { '::nova::compute::libvirt':
|
||||
libvirt_virt_type => $libvirt_virt_type,
|
||||
libvirt_cpu_mode => $libvirt_cpu_mode,
|
||||
migration_support => true,
|
||||
vncserver_listen => '0.0.0.0',
|
||||
# TODO: enable it again when puppet 4.5 will be idempotent
|
||||
|
Loading…
Reference in New Issue
Block a user