From df5226cac6107e8dae914c3fe64bef5032b27889 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 15 Sep 2024 23:16:54 +0900 Subject: [PATCH] Fix inconsistent deployment architecture switch 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 37195f63e427615cba335498579f2222060f3c0f) (cherry picked from commit 790dc6ac6fe62a15ee3cd7e4ce0768b2a46f7238) --- fixtures/scenario004.pp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index f647f0ea2..2e7bc3162 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -20,19 +20,23 @@ if $facts['os']['name'] == 'Ubuntu' { $ssl = true } -if $facts['os']['name'] == 'Ubuntu' { - $ipv6 = false - # TODO(tobias-urdin): No service plugin 'BGPVPN' - $bgpvpn_enabled = false - # TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found. - $l2gw_enabled = false - # FIXME(ykarel) Disable bgp_dragent until Ubuntu python3 stein(with stein packages) jobs are ready - $bgp_dragent_enabled = false -} else { - $ipv6 = true - $bgpvpn_enabled = true - $l2gw_enabled = true - $bgp_dragent_enabled = true +case $facts['os']['family'] { + 'Debian': { + $ipv6 = false + # TODO(tkajinam): Need additional work to load the plugins + $bgpvpn_enabled = false + $l2gw_enabled = false + $bgp_dragent_enabled = false + } + 'RedHat': { + $ipv6 = true + $bgpvpn_enabled = true + $l2gw_enabled = true + $bgp_dragent_enabled = true + } + default: { + fail("Unsupported osfamily (${facts['os']['family']})") + } } include openstack_integration