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 commit37195f63e4) (cherry picked from commit790dc6ac6f)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user