From cec99ce836ebdb0f6e67e93a846c059a563c4421 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Thu, 13 Oct 2016 13:07:02 +0000 Subject: [PATCH] Revert "Disable sahara on centos for scenario003" This should have been fixed by https://review.openstack.org/#/c/385701/ This reverts commit 49dd604c6816e62347b108d53bdd9791de3fa512. Change-Id: I34d29b1c271f9b133171dc00b17c031fbd416106 --- fixtures/scenario003.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index f440919a0..f3ef6fc97 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -37,17 +37,12 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease # linuxbridge driver is not working with latest Ubuntu packaging. $neutron_plugin = 'openvswitch' $designate_enabled = true - $sahara_enabled = true } else { $ssl_enabled = true $neutron_plugin = 'linuxbridge' # Designate packaging in Ocata is missing monasca dependencies. # Until it's fixed, let's disable it. $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 @@ -82,7 +77,7 @@ class { '::openstack_integration::tempest': designate => $designate_enabled, trove => true, mistral => $mistral_enabled, - sahara => $sahara_disabled, + sahara => true, horizon => true, heat => true, }