openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Disable cinder-backup by default 

The cinder-backup service was not configured in mitaka, so
having it disabled by default does not change the existing
behavior.

Also adds an environment file to enable it in the pacemaker
scenario.

Change-Id: I9a238e0d4601c9f59aff94fdac837c7d0e90afa0
This commit is contained in:
Giulio Fidente 2016-08-19 11:54:54 +02:00
parent e59cef59b6
commit 9b739012b7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/cinder-backup.yaml Normal file
View File

@ -0,0 +1,4 @@
resource_registry:
OS::TripleO::Services::CinderBackup: ../puppet/services/pacemaker/cinder-backup.yaml
# For non-pcmk managed implementation
# OS::TripleO::Services::CinderBackup: ../puppet/services/cinder-backup.yaml

1
environments/puppet-pacemaker.yaml
View File

@ -9,7 +9,6 @@ resource_registry:
# custom pacemaker services
# 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
OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml

2
overcloud-resource-registry-puppet.yaml
View File

@ -134,7 +134,7 @@ resource_registry:
OS::TripleO::Services::CephClient: OS::Heat::None
OS::TripleO::Services::CephExternal: OS::Heat::None
OS::TripleO::Services::CinderApi: puppet/services/cinder-api.yaml
OS::TripleO::Services::CinderBackup: puppet/services/cinder-backup.yaml
OS::TripleO::Services::CinderBackup: OS::Heat::None
OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml
OS::TripleO::Services::Core: OS::Heat::None