diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-08-19 11:54:54 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-08-19 12:06:37 +0200 |
| commit | 9b739012b71e2833e59e94cbe423cda77405c6cb (patch) | |
| tree | 0509af77e9f75b8163a281363a097d956777d42b | |
| parent | e59cef59b66f16338084213277cff6f61867efbf (diff) | |
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
| -rw-r--r-- | environments/cinder-backup.yaml | 4 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 1 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/environments/cinder-backup.yaml b/environments/cinder-backup.yaml new file mode 100644 index 00000000..f01fcbd9 --- /dev/null +++ b/environments/cinder-backup.yaml @@ -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
\ No newline at end of file diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index fbba1872..41f1f1dc 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -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 diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 4d31b69c..1f6cbf94 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -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 |