openstack/puppet-openstack-integration
Code Issues Proposed changes

Update l2gw status on scenario004

Browse Source 
Ubuntu: Disables the l2gw plugin for neutron in scenario004
until python-networking-l2gw has been cut from a
newer version where it uses the fault map from neutron lib.
See https://bugs.launchpad.net/ubuntu/+source/networking-l2gw/+bug/1739779

CentOS: Re-enable the service since the new package has been promoted in
RDO.

Change-Id: I96cf4aee873bb03ce0a0c0ea2603f68e3a8c3573
This commit is contained in:
Tobias Urdin 2017-12-22 14:38:17 +01:00 committed by Emilien Macchi
parent 8278962136
commit 858122ca0e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fixtures/scenario004.pp
View File

@ -21,14 +21,15 @@ if $::operatingsystem == 'Ubuntu' {
$watcher_enabled = false $watcher_enabled = false
# TODO(rnoriega) Enable testing for BGPVPN when UCA releases pike-m1 # TODO(rnoriega) Enable testing for BGPVPN when UCA releases pike-m1
$bgpvpn_enabled = false $bgpvpn_enabled = false
$l2gw_enabled = true # TODO(tobasco): Enable l2gw on Ubuntu again when networking-l2gw has
# been cut with a newer version.
# See https://bugs.launchpad.net/ubuntu/+source/networking-l2gw/+bug/1739779
$l2gw_enabled = false
} else { } else {
$ipv6 = true $ipv6 = true
$watcher_enabled = true $watcher_enabled = true
$bgpvpn_enabled = true $bgpvpn_enabled = true
# Until https://review.rdoproject.org/r/#/c/11064/ is merged and $l2gw_enabled = true
# in consistent repo.
$l2gw_enabled = false
} }
include ::openstack_integration include ::openstack_integration
@ -49,7 +50,7 @@ class { '::openstack_integration::glance':
} }
class { '::openstack_integration::neutron': class { '::openstack_integration::neutron':
bgpvpn_enabled => $bgpvpn_enabled, bgpvpn_enabled => $bgpvpn_enabled,
l2gw_enabled => true, l2gw_enabled => $l2gw_enabled,
} }
class { '::openstack_integration::nova': class { '::openstack_integration::nova':
libvirt_rbd => true, libvirt_rbd => true,