openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Support cinder-volume running active-active"

This commit is contained in:
Zuul 2019-03-08 03:18:29 +00:00 committed by Gerrit Code Review
parent 1ea9935576 5b11bb39da
commit 5ff45134ac
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -61,6 +61,15 @@ parameters:
description: >
The Ceph cluster name must be at least 1 character and contain only
letters and numbers.
CinderVolumeCluster:
default: ''
description: >
The cluster name used for deploying the cinder-volume service in an
active-active (A/A) configuration. This configuration requires the
Cinder backend drivers support A/A, and the cinder-volume service not
be managed by pacemaker. If these criteria are not met then the cluster
name must be left blank.
type: string
CinderEnableNfsBackend:
default: false
description: Whether to enable or not the NFS backend for Cinder
@ -187,6 +196,7 @@ outputs:
- tripleo::profile::base::cinder::volume::cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend}
tripleo::profile::base::cinder::volume::cinder_enable_nfs_backend: {get_param: CinderEnableNfsBackend}
tripleo::profile::base::cinder::volume::cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
tripleo::profile::base::cinder::volume::cinder_volume_cluster: {get_param: CinderVolumeCluster}
tripleo::profile::base::cinder::volume::nfs::cinder_nfs_mount_options: {get_param: CinderNfsMountOptions}
tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers: {get_param: CinderNfsServers}
tripleo::profile::base::cinder::volume::nfs::cinder_nfs_snapshot_support: {get_param: CinderNfsSnapshotSupport}

8
environments/cinder-volume-active-active.yaml Normal file
View File

@ -0,0 +1,8 @@
resource_registry:
# For A/A mode, do not run the cinder-volume service under pacemaker.
OS::TripleO::Services::CinderVolume: ../deployment/cinder/cinder-volume-container-puppet.yaml
# Cinder requires etcd for use as its Distributed Lock Manager (DLM).
OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-puppet.yaml
parameter_defaults:
CinderVolumeCluster: tripleo

8
releasenotes/notes/cinder-volume-active-active-976f2bc33ab52c94.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
Add the ability to configure the cinder-volume service to run in
active-active (A/A) mode using the cluster name specified by the new
CinderVolumeCluster parameter. Note that A/A mode requires the backend
driver support running A/A. Cinder's RBD driver supports A/A, but most
other cinder drivers currently do not.