From 0327fc2bbb1be9972d99e2e83d54d07410ad01d9 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 30 Jun 2016 17:50:28 +0100 Subject: Add Sahara services to ControllerServices list https://review.openstack.org/#/c/318840/ decomposed the Sahara services but they weren't added to the ControllerServices list, thus are now disabled. Since we shipped mitaka with sahara enabled by default, we should probably add them so the behavior is consistent when folks upgrade. This also fixes a couple of issues we missed when landing the initial service templates (partly because CI didn't test them). In order for each service to operate independently when used with Pacemaker, the roles needed to be separated. This commit also does this. Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1 Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c Closes-Bug: #1592284 Co-Authored-By: Brad P. Crochet --- environments/puppet-pacemaker.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'environments/puppet-pacemaker.yaml') diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 16430290..74b91106 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -18,3 +18,5 @@ resource_registry: OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml # Services that are disabled by default (use relevant environment files): OS::Tripleo::Services::ManilaShare: OS::Heat::None + OS::TripleO::Services::SaharaApi: ../puppet/services/pacemaker/sahara-api.yaml + OS::TripleO::Services::SaharaEngine: ../puppet/services/pacemaker/sahara-engine.yaml -- cgit 1.2.3-korg