From 5b85f976077ea7360f2af195d678c7f5aec9d127 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 31 May 2016 11:51:33 -0400
Subject: [PATCH] scenario003/xenial: disable trove

Trove Taskmanager is failing to start quite often, it's probably a bug
somewhere but in the meantime we find it, let's disable its testing.

This is part of this work:
https://etherpad.openstack.org/p/puppet-openstack-xenial
Where we have a list of blockers and workarounds, until things get
stable.

Change-Id: I7cab232eee44c12f9ad6d5e00674847784a2df25
---
 fixtures/scenario003.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index fce1e0e7b..32ec195e9 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -33,12 +33,15 @@ case $::osfamily {
 # List of workarounds for Ubuntu Xenial:
 # - disable Horizon
 # - disable SSL
+# - disable Trove (Taskmanager is failing)
 if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
   $ssl_enabled     = false
   $horizon_enabled = false
+  $trove_enabled   = false
 } else {
   $ssl_enabled     = true
   $horizon_enabled = true
+  $trove_enabled   = true
 }
 
 include ::openstack_integration
@@ -57,7 +60,9 @@ class { '::openstack_integration::neutron':
   driver => 'linuxbridge',
 }
 include ::openstack_integration::nova
-include ::openstack_integration::trove
+if $trove_enabled {
+  include ::openstack_integration::trove
+}
 if $horizon_enabled {
   include ::openstack_integration::horizon
 }
@@ -68,7 +73,7 @@ include ::openstack_integration::sahara
 include ::openstack_integration::provision
 
 class { '::openstack_integration::tempest':
-  trove   => true,
+  trove   => $trove_enabled,
   sahara  => true,
   mistral => $mistral_enabled,
   horizon => $horizon_enabled,