From f2f4b462fa378951e51889e0e49f945d6be81c4a Mon Sep 17 00:00:00 2001
From: Denis Egorenko <degorenko@mirantis.com>
Date: Thu, 14 Apr 2016 14:18:30 +0300
Subject: [PATCH] Enable Sahara integration job on Ubuntu

Sahara package in Ubuntu is fixed now, so let's enable Sahara back.

Change-Id: I134c58b8eac87c35fb04bfbe1f5e8c5c3aa57b71
---
 fixtures/scenario003.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index f3c77d5b5..08a659b2e 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -17,15 +17,11 @@
 case $::osfamily {
   'Debian': {
     $ipv6            = false
-    # sahara is broken for Ubuntu Trusty and Debian
-    # ConfigParser.NoSectionError: No section: 'alembic'
-    $sahara_enabled  = false
     # mistral is not packaged on Ubuntu Trusty
     $mistral_enabled = false
   }
   'RedHat': {
     $ipv6            = true
-    $sahara_enabled  = true
     # enable when we figure why mistral tempest tests are so unstable
     $mistral_enabled = false
   }
@@ -53,14 +49,12 @@ include ::openstack_integration::horizon
 include ::openstack_integration::heat
 # enable when we figure why mistral tempest tests are so unstable
 # include ::openstack_integration::mistral
-if $sahara_enabled {
-  include ::openstack_integration::sahara
-}
+include ::openstack_integration::sahara
 include ::openstack_integration::provision
 
 class { '::openstack_integration::tempest':
   trove   => true,
-  sahara  => $sahara_enabled,
+  sahara  => true,
   mistral => $mistral_enabled,
   horizon => true,
   heat    => true,