openstack/puppet-openstack-integration
Code Issues Proposed changes

Enable Sahara integration job on Ubuntu

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

Change-Id: I134c58b8eac87c35fb04bfbe1f5e8c5c3aa57b71
This commit is contained in:
Denis Egorenko 2016-04-14 14:18:30 +03:00
parent 8e695406b5
commit f2f4b462fa
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fixtures/scenario003.pp
View File

@ -17,15 +17,11 @@
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $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 is not packaged on Ubuntu Trusty
$mistral_enabled = false $mistral_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$sahara_enabled = true
# enable when we figure why mistral tempest tests are so unstable # enable when we figure why mistral tempest tests are so unstable
$mistral_enabled = false $mistral_enabled = false
} }
@ -53,14 +49,12 @@ include ::openstack_integration::horizon
include ::openstack_integration::heat include ::openstack_integration::heat
# enable when we figure why mistral tempest tests are so unstable # enable when we figure why mistral tempest tests are so unstable
# include ::openstack_integration::mistral # include ::openstack_integration::mistral
if $sahara_enabled {
include ::openstack_integration::sahara include ::openstack_integration::sahara
}
include ::openstack_integration::provision include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
trove => true, trove => true,
sahara => $sahara_enabled, sahara => true,
mistral => $mistral_enabled, mistral => $mistral_enabled,
horizon => true, horizon => true,
heat => true, heat => true,