From 063a1b60945eb891ee76ab4893a62d950f1c021e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias@busybox.se>
Date: Sun, 11 Mar 2018 10:49:28 +0100
Subject: [PATCH] Try enabling and fix comments

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
---
 fixtures/scenario001.pp |  5 ++---
 fixtures/scenario003.pp |  2 --
 fixtures/scenario004.pp | 15 ++++++---------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index cca9c3958..c4e121d15 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -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',
 }
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 8a3df1047..3234cf753 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -37,8 +37,6 @@ case $::osfamily {
   }
 }
 
-# List of workarounds for Ubuntu Xenial:
-# - disable SSL
 if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
   # Disable Designate MDS on Ubuntu until we find why Puppet run is not
   # idempotent sometimes.
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 54a8dd5d2..2d25036e3 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -14,22 +14,19 @@
 # limitations under the License.
 #
 
-# Disable SSL (workaround for Xenial)
 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