openstack/tripleo-heat-templates
Code Issues Proposed changes

Reintroduce containerized Cinder

Browse Source 
Change-Id: Ied8429be0eb16e4d775d1dfe0c2f0f31f9e01e23
Closes-Bug: #1700140
This commit is contained in:
Jiri Stransky 2017-06-29 18:50:36 +02:00
parent e1a9638732
commit 2f9ed49748
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/docker-ha.yaml
View File

@ -12,9 +12,7 @@ resource_registry:
OS::TripleO::Services::Keepalived: OS::Heat::None
# HA Containers managed by pacemaker
# FIXME: enable those Cinder services once their non-HA counterpart are enabled
# OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
# OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::HAproxy: ../docker/services/pacemaker/haproxy.yaml
OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml

10
environments/docker.yaml
View File

@ -53,12 +53,10 @@ resource_registry:
OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml
OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml
# FIXME: Had to remove these to unblock containers CI. They should be put back when fixed.
# OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
# OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
# OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
# OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
#
OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
# If SR-IOV is enabled on the compute nodes, it will need the SR-IOV
# host configuration.
OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None

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

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