Fix inconsistent deployment architecture switch
Only scenario 004 used 'Ubuntu or not' while the other scenarios use
'Debian family or not'.
Change-Id: I6f9d1181c9e51ea97129f12ee36bbfa9f0cde189
(cherry picked from commit 37195f63e4)
This commit is contained in:
1 changed files with 21 additions and 18 deletions
@@ -20,24 +20,27 @@ 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
# TODO(tkajinam): Enable these along with the other plugins
$vpnaas_enabled = false
$taas_enabled = false
}else{
$ipv6 = true
$bgpvpn_enabled = true
$l2gw_enabled = true
$bgp_dragent_enabled = true
$vpnaas_enabled = true
$taas_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
$vpnaas_enabled = false
$taas_enabled = false
}
'RedHat':{
$ipv6 = true
$bgpvpn_enabled = true
$l2gw_enabled = true
$bgp_dragent_enabled = true
$vpnaas_enabled = true
$taas_enabled = true
}
default:{
fail("Unsupported osfamily (${facts['os']['family']})")
}
}
includeopenstack_integration
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.