From ecf76fd73407f0c6c1fe8b296928088d677120a8 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 14 Sep 2016 16:47:46 +0530 Subject: [PATCH] Enable sahara testing in scenario003 * Sahara upstream moved the Tempest plugin to sahara-tests and python-sahara-tests-tempest is available now which contains the tempest plugin for sahara. * Related changes to puppet-tempest is here: https://review.openstack.org/#/c/369878/ This patch will enable sahara testing in scenario003 Depends-On: Ib556393e6c89fc11234e664d476cb0b6f2cac74f Change-Id: I3cef28a8a89d4e9820039d93b9d0eece78697399 --- fixtures/scenario003.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 6d6a551da..a41892dcd 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -36,15 +36,12 @@ case $::osfamily { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { $ssl_enabled = false $trove_enabled = false - $sahara_enabled = true # linuxbridge driver is not working with latest Ubuntu packaging. $neutron_plugin = 'openvswitch' } else { $ssl_enabled = true # https://bugs.launchpad.net/trove/+bug/1597857 $trove_enabled = true - # https://bugzilla.redhat.com/show_bug.cgi?id=1318765 - $sahara_enabled = false $neutron_plugin = 'linuxbridge' } @@ -77,8 +74,8 @@ include ::openstack_integration::provision class { '::openstack_integration::tempest': trove => $trove_enabled, - sahara => $sahara_enabled, mistral => $mistral_enabled, + sahara => true, horizon => true, heat => true, }