Try enabling and fix comments

Code Issues Proposed changes

Fixing some comments that were left behind or
just plain wrong. Enabling l2gw on Ubuntu again
since a new package was released, also testing
enabling of bgpvpn on Ubuntu since it said pike
release on the comment.
Change-Id: Ic0028a36b96bce6791e8b3dd7c0cb482d0cd1d2b

This commit is contained in:

Tobias Urdin

2018年03月11日 10:49:28 +01:00

parent b4c3df5a02

commit 063a1b6094

3 changed files with 8 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario001.pp

View File

@@ -17,8 +17,7 @@

case$::osfamily{

'Debian': {

$ipv6 = false

# panko, gnocchi and vitrage are not packaged yet in debian/ubuntu

# https://bugs.launchpad.net/cloud-archive/+bug/1535740

# vitrage are not packaged yet in debian/ubuntu

$enable_vitrage = false

$om_rpc = 'rabbit'

$om_notify = 'rabbit'

@@ -51,7 +50,7 @@ if ($om_rpc == 'amqp') {

}

include::openstack_integration::mysql

class{ '::openstack_integration::keystone':

# NOTE(sileht):zTelemetry autoscaling tempest tests can't renew token, so we

# NOTE(sileht):Telemetry autoscaling tempest tests can't renew token, so we

# use a long one

token_expiration => '2400',

}

2
fixtures/scenario003.pp

View File

@@ -37,8 +37,6 @@ case $::osfamily {

}

#ListofworkaroundsforUbuntuXenial:

#-disableSSL

if($::operatingsystem=='Ubuntu')and(versioncmp($::operatingsystemmajrelease,'16')>=0){

# Disable Designate MDS on Ubuntu until we find why Puppet run is not

# idempotent sometimes.

15
fixtures/scenario004.pp

View File

@@ -14,22 +14,19 @@

#limitationsundertheLicense.

#

#DisableSSL(workaroundforXenial)

if$::operatingsystem=='Ubuntu'{

$ipv6 = false

# Watcher packages are not available in Ubuntu repository.

$watcher_enabled = false

# TODO(rnoriega) Enable testing for BGPVPN when UCA releases pike-m1

$bgpvpn_enabled = false

# 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

# TODO(tobasco): No service plugin 'BGPVPN'

$bgpvpn_enabled = false

# TODO(tobasco): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found.

$l2gw_enabled = false

}else{

$ipv6 = true

$watcher_enabled = true

$bgpvpn_enabled = true

$l2gw_enabled = true

$bgpvpn_enabled = true

$l2gw_enabled = true

}

include::openstack_integration