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'.

Conflicts:
	fixtures/scenario004.pp

Change-Id: I6f9d1181c9e51ea97129f12ee36bbfa9f0cde189
(cherry picked from commit 37195f63e4)
(cherry picked from commit 790dc6ac6f)
This commit is contained in:
Takashi Kajinami
2024-09-15 23:16:54 +09:00
parent 777ac3e841
commit df5226cac6
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fixtures/scenario004.pp
View File

@@ -20,19 +20,23 @@ 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 }
} else { 'RedHat': {
$ipv6 = true $ipv6 = true
$bgpvpn_enabled = true $bgpvpn_enabled = true
$l2gw_enabled = true $l2gw_enabled = true
$bgp_dragent_enabled = true $bgp_dragent_enabled = true
}
default: {
fail("Unsupported osfamily (${facts['os']['family']})")
}
} }
include openstack_integration include openstack_integration