openstack/puppet-openstack-integration
Code Issues Proposed changes

Enable sahara testing in scenario003

Browse Source 
* 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
This commit is contained in:
Chandan Kumar 2016-09-14 16:47:46 +05:30
parent cce709e9e3
commit ecf76fd734
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario003.pp
View File

@ -36,15 +36,12 @@ case $::osfamily {
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false $ssl_enabled = false
$trove_enabled = false $trove_enabled = false
$sahara_enabled = true
# linuxbridge driver is not working with latest Ubuntu packaging. # linuxbridge driver is not working with latest Ubuntu packaging.
$neutron_plugin = 'openvswitch' $neutron_plugin = 'openvswitch'
} else { } else {
$ssl_enabled = true $ssl_enabled = true
# https://bugs.launchpad.net/trove/+bug/1597857 # https://bugs.launchpad.net/trove/+bug/1597857
$trove_enabled = true $trove_enabled = true
# https://bugzilla.redhat.com/show_bug.cgi?id=1318765
$sahara_enabled = false
$neutron_plugin = 'linuxbridge' $neutron_plugin = 'linuxbridge'
} }
@ -77,8 +74,8 @@ include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
trove => $trove_enabled, trove => $trove_enabled,
sahara => $sahara_enabled,
mistral => $mistral_enabled, mistral => $mistral_enabled,
sahara => true,
horizon => true, horizon => true,
heat => true, heat => true,
} }