openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Test deployment with modular libvirt daemons"

This commit is contained in:
Zuul 2023-04-11 18:29:47 +00:00 committed by Gerrit Code Review
parent 98044f9493 c966b23114
commit 70a8e4d6c3
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario005.pp
View File

@ -23,9 +23,11 @@ if $facts['os']['name'] == 'Ubuntu' {
case $facts['os']['family'] { case $facts['os']['family'] {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false
$modular_libvirt = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$modular_libvirt = true
} }
default: { default: {
fail("Unsupported osfamily (${facts['os']['family']})") fail("Unsupported osfamily (${facts['os']['family']})")
@ -55,7 +57,8 @@ class { 'openstack_integration::neutron':
} }
include openstack_integration::placement include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':
cinder_enabled => true, cinder_enabled => true,
modular_libvirt => $modular_libvirt,
} }
class { 'openstack_integration::octavia': class { 'openstack_integration::octavia':
provider_driver => 'ovn' provider_driver => 'ovn'

21
manifests/nova.pp
View File

@ -14,6 +14,11 @@
# Possible values include custom, host-model, none, host-passthrough. # Possible values include custom, host-model, none, host-passthrough.
# Defaults to 'none' # Defaults to 'none'
# #
# [*modular_libvirt*]
# (optional) Use modular libvirt daemons instead of the monolithic libvirtd
# deamon
# Defaults to false
#
# [*volume_encryption*] # [*volume_encryption*]
# (optional) Boolean to configure or not volume encryption # (optional) Boolean to configure or not volume encryption
# Defaults to false. # Defaults to false.
@ -30,6 +35,7 @@ class openstack_integration::nova (
$libvirt_rbd = false, $libvirt_rbd = false,
$libvirt_virt_type = 'qemu', $libvirt_virt_type = 'qemu',
$libvirt_cpu_mode = 'none', $libvirt_cpu_mode = 'none',
$modular_libvirt = false,
$volume_encryption = false, $volume_encryption = false,
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$cinder_enabled = false, $cinder_enabled = false,
@ -201,8 +207,9 @@ class openstack_integration::nova (
default => 'tcp' default => 'tcp'
} }
class { 'nova::migration::libvirt': class { 'nova::migration::libvirt':
transport => $migration_transport, transport => $migration_transport,
listen_address => $::openstack_integration::config::host, listen_address => $::openstack_integration::config::host,
modular_libvirt => $modular_libvirt,
} }
$images_type = $libvirt_rbd ? { $images_type = $libvirt_rbd ? {
@ -210,9 +217,13 @@ class openstack_integration::nova (
false => $facts['os_service_default'] false => $facts['os_service_default']
} }
class { 'nova::compute::libvirt': class { 'nova::compute::libvirt':
virt_type => $libvirt_virt_type, virt_type => $libvirt_virt_type,
cpu_mode => $libvirt_cpu_mode, cpu_mode => $libvirt_cpu_mode,
images_type => $images_type, images_type => $images_type,
manage_libvirt_services => false,
}
class { 'nova::compute::libvirt::services':
modular_libvirt => $modular_libvirt,
} }
class { 'nova::compute::libvirt::networks': } class { 'nova::compute::libvirt::networks': }
if $libvirt_rbd { if $libvirt_rbd {