Temporarily disable dynamic_routing and bgpvpn from scenario004
Upstream dynamic_routing project has switched to os-ken. To implement this change we are disabling exercising dr adn bgpvpn which requires it to fix packaging, get new package promoted and then fix puppet-neutron to use the right bgp_speaker_driver. Change-Id: Ia9f2c4a9bca926a9c7a61fd49ca1005708478e25
This commit is contained in:
parent
0ab0a819f7
commit
4bc57e6541
@ -34,7 +34,7 @@ if $::operatingsystem == 'Ubuntu' {
|
|||||||
} else {
|
} else {
|
||||||
$ipv6 = true
|
$ipv6 = true
|
||||||
$watcher_enabled = true
|
$watcher_enabled = true
|
||||||
$bgpvpn_enabled = true
|
$bgpvpn_enabled = false
|
||||||
$l2gw_enabled = true
|
$l2gw_enabled = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ class { '::openstack_integration::glance':
|
|||||||
class { '::openstack_integration::neutron':
|
class { '::openstack_integration::neutron':
|
||||||
bgpvpn_enabled => $bgpvpn_enabled,
|
bgpvpn_enabled => $bgpvpn_enabled,
|
||||||
l2gw_enabled => $l2gw_enabled,
|
l2gw_enabled => $l2gw_enabled,
|
||||||
bgp_dragent_enabled => true,
|
bgp_dragent_enabled => false,
|
||||||
}
|
}
|
||||||
class { '::openstack_integration::nova':
|
class { '::openstack_integration::nova':
|
||||||
libvirt_rbd => true,
|
libvirt_rbd => true,
|
||||||
@ -78,5 +78,5 @@ class { '::openstack_integration::tempest':
|
|||||||
bgpvpn => $bgpvpn_enabled,
|
bgpvpn => $bgpvpn_enabled,
|
||||||
l2gw => $l2gw_enabled,
|
l2gw => $l2gw_enabled,
|
||||||
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
|
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
|
||||||
dr => true,
|
dr => false,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user