aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-06-30 17:50:28 +0100
committerCarlos Camacho <ccamacho@redhat.com>2016-08-06 10:45:31 +0200
commit0327fc2bbb1be9972d99e2e83d54d07410ad01d9 (patch)
tree1752ba09ea4e4b699206abac7bbe32e289c9ebb8 /environments
parent77cca14bd760f091a1e481bd44e96f8882fb99cc (diff)
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 <brad@redhat.com>
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-pacemaker.yaml2
1 files changed, 2 insertions, 0 deletions
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