Merge "Ubuntu: Disable Trove"

This commit is contained in:
Zuul 2024-05-06 16:37:55 +00:00 committed by Gerrit Code Review
commit 4f3180efc2

View File

@ -23,9 +23,13 @@ if $facts['os']['name'] == 'Ubuntu' {
case $facts['os']['family'] { case $facts['os']['family'] {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false
# NOTE(tkajinam): UCA Caracal does not provide trove packages
# https://bugs.launchpad.net/ubuntu/+source/openstack-trove/+bug/2064838
$trove_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$trove_enabled = true
} }
default: { default: {
fail("Unsupported osfamily (${facts['os']['family']})") fail("Unsupported osfamily (${facts['os']['family']})")
@ -56,7 +60,9 @@ include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':
cinder_enabled => true, cinder_enabled => true,
} }
include openstack_integration::trove if $trove_enabled {
include openstack_integration::trove
}
class { 'openstack_integration::horizon': class { 'openstack_integration::horizon':
heat_enabled => true heat_enabled => true
} }
@ -72,7 +78,7 @@ class { 'openstack_integration::magnum':
class { 'openstack_integration::tempest': class { 'openstack_integration::tempest':
designate => true, designate => true,
trove => true, trove => $trove_enabled,
mistral => true, mistral => true,
horizon => true, horizon => true,
# NOTE(tkajinam): The scenario job we enable requires cinder, which is not # NOTE(tkajinam): The scenario job we enable requires cinder, which is not