openstack/puppet-openstack-integration
Code Issues Proposed changes

Disable l2gw testing on centos7

Browse Source 
... until https://review.rdoproject.org/r/#/c/11064/ is merged.

Change-Id: I77a3689d14059a7fa2fde556b3e0513f28561aaf
This commit is contained in:
Emilien Macchi 2017-12-21 14:22:31 -08:00
parent 994eaa1505
commit 40c7596c9b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fixtures/scenario004.pp
View File

@ -21,10 +21,14 @@ 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
} 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
# in consistent repo.
$l2gw_enabled = false
} }
include ::openstack_integration include ::openstack_integration
@ -66,6 +70,6 @@ include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
watcher => $watcher_enabled, watcher => $watcher_enabled,
bgpvpn => $bgpvpn_enabled, bgpvpn => $bgpvpn_enabled,
l2gw => true, l2gw => $l2gw_enabled,
l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100', l2gw_switch => 'cell08-5930-01::FortyGigE1/0/1|100',
} }