diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-18 12:43:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-18 12:43:01 +0000 |
| commit | 9f71f73a48fb9e0a737a8b8682c54a5da7f22227 (patch) | |
| tree | 0b51cc69c4f05e72079de2c609d0ca73b2657c02 /environments | |
| parent | f737847c33c4a518fcb9c5909ed077a2e3811b43 (diff) | |
| parent | d923556a05230f973a038340282f8dd41097af77 (diff) | |
Merge "Make sahara run via systemd"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 54f37a48..fbba1872 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 |