openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix inconsistent deployment architecture switch

Browse Source 
Only scenario 004 used 'Ubuntu or not' while the other scenarios use
'Debian family or not'.

Change-Id: I6f9d1181c9e51ea97129f12ee36bbfa9f0cde189
This commit is contained in:
Takashi Kajinami 2024-09-15 23:16:54 +09:00
parent 7b019c74d1
commit 37195f63e4
1 changed files with 21 additions and 18 deletions

39
fixtures/scenario004.pp

@ -20,24 +20,27 @@ if $facts['os']['name'] == 'Ubuntu' {
$ssl = true $ssl = true
} }
if $facts['os']['name'] == 'Ubuntu' { case $facts['os']['family'] {
$ipv6 = false 'Debian': {
# TODO(tobias-urdin): No service plugin 'BGPVPN' $ipv6 = false
$bgpvpn_enabled = false # TODO(tkajinam): Need additional work to load the plugins
# TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found. $bgpvpn_enabled = false
$l2gw_enabled = false $l2gw_enabled = false
# FIXME(ykarel) Disable bgp_dragent until Ubuntu python3 stein(with stein packages) jobs are ready $bgp_dragent_enabled = false
$bgp_dragent_enabled = false $vpnaas_enabled = false
# TODO(tkajinam): Enable these along with the other plugins $taas_enabled = false
$vpnaas_enabled = false }
$taas_enabled = false 'RedHat': {
} else { $ipv6 = true
$ipv6 = true $bgpvpn_enabled = true
$bgpvpn_enabled = true $l2gw_enabled = true
$l2gw_enabled = true $bgp_dragent_enabled = true
$bgp_dragent_enabled = true $vpnaas_enabled = true
$vpnaas_enabled = true $taas_enabled = true
$taas_enabled = true }
default: {
fail("Unsupported osfamily (${facts['os']['family']})")
}
} }
include openstack_integration include openstack_integration