aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2016-08-16 14:49:19 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-08-17 16:08:37 +0200
commitd923556a05230f973a038340282f8dd41097af77 (patch)
tree113045f439957eea4f1c74740f2117d6d796b491
parent06303090ae63df4ae16d02dadee52634c1527260 (diff)
Make sahara run via systemd
Via commit 0327fc2bbb1be9972d99e2e83d54d07410ad01d9 we added sahara as a composable service. Let's make sure sahara-api and sahara-engine run via systemd and not as a pacemaker resource. This is inline with the HA NG spec. Change-Id: I5634ad43771fba798892df6d2297c2634dcb6756
-rw-r--r--environments/puppet-pacemaker.yaml7
1 files changed, 2 insertions, 5 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 54f37a4..fbba187 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -7,9 +7,8 @@ resource_registry:
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
# custom pacemaker services
- # NOTE: For now we will need to specify overrides to all services
- # which use pacemaker. In the future (with upcoming HA light work) this
- # list will hopefully be much smaller however.
+ # NOTE: Please before adding any pacemaker-managed services, get in touch
+ # with bandini, Ng or beekhof
OS::TripleO::Services::CinderBackup: ../puppet/services/pacemaker/cinder-backup.yaml
OS::TripleO::Services::CinderVolume: ../puppet/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
@@ -19,5 +18,3 @@ 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