Merge "CentOS: Use modular libvirt for all scenarios"
This commit is contained in:
commit
393e0fb57a
@ -23,13 +23,11 @@ if $facts['os']['name'] == 'Ubuntu' {
|
|||||||
case $facts['os']['family'] {
|
case $facts['os']['family'] {
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$ipv6 = false
|
$ipv6 = false
|
||||||
$modular_libvirt = false
|
|
||||||
$ovn_metadata_agent_enabled = true
|
$ovn_metadata_agent_enabled = true
|
||||||
$jobboard_backend = 'redis'
|
$jobboard_backend = 'redis'
|
||||||
}
|
}
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$ipv6 = true
|
$ipv6 = true
|
||||||
$modular_libvirt = true
|
|
||||||
$ovn_metadata_agent_enabled = false
|
$ovn_metadata_agent_enabled = false
|
||||||
$jobboard_backend = 'redis_sentinel'
|
$jobboard_backend = 'redis_sentinel'
|
||||||
}
|
}
|
||||||
@ -64,7 +62,6 @@ 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,
|
|
||||||
libvirt_guests_enabled => true,
|
libvirt_guests_enabled => true,
|
||||||
}
|
}
|
||||||
class { 'openstack_integration::octavia':
|
class { 'openstack_integration::octavia':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user