openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Revert "Disable sahara on centos for scenario003""

Browse Source
This commit is contained in:
Jenkins 2016-10-14 00:09:03 +00:00 committed by Gerrit Code Review
commit 214ffc18e2
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fixtures/scenario003.pp
View File

@ -37,17 +37,12 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease
# linuxbridge driver is not working with latest Ubuntu packaging. # linuxbridge driver is not working with latest Ubuntu packaging.
$neutron_plugin = 'openvswitch' $neutron_plugin = 'openvswitch'
$designate_enabled = true $designate_enabled = true
$sahara_enabled = true
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$neutron_plugin = 'linuxbridge' $neutron_plugin = 'linuxbridge'
# Designate packaging in Ocata is missing monasca dependencies. # Designate packaging in Ocata is missing monasca dependencies.
# Until it's fixed, let's disable it. # Until it's fixed, let's disable it.
$designate_enabled = false $designate_enabled = false
# TODO(aschultz): Sahara disabled because it was broken by
# https://review.openstack.org/#/c/380082 and we probably need an updated
# package
$sahara_enabled = false
} }
include ::openstack_integration include ::openstack_integration
@ -82,7 +77,7 @@ class { '::openstack_integration::tempest':
designate => $designate_enabled, designate => $designate_enabled,
trove => true, trove => true,
mistral => $mistral_enabled, mistral => $mistral_enabled,
sahara => $sahara_disabled, sahara => true,
horizon => true, horizon => true,
heat => true, heat => true,
} }