openstack/tripleo-heat-templates
Code Issues Proposed changes

Containerize cinder services under pacemaker in CI

Browse Source 
This patch fixes a timing issue with cinder's db sync when
cinder-manage is containerized but cinder-volume is not.

Cinder services were containerized in [1], and this patch updates
the CI jobs so cinder-volume and cinder-backup with pacemaker are
also containerized.

[1] https://review.openstack.org/479001

Change-Id: Ic20af8a9bb24c4d21d1fd71bc65b001aa9c09c7c
Closes-Bug: #1729253
Closes-Bug: #1729339
This commit is contained in:
Alan Bishop 2017-11-01 12:14:57 -04:00 committed by Martin André
parent 72c5c73aaa
commit 17d3488895
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/environments/multinode-containers.yaml
View File

@ -7,9 +7,7 @@ resource_registry:
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
# TODO(mandre) use the containerized service once we've reintroduced cinder
# OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::CinderVolume: ../../puppet/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None

7
ci/environments/scenario001-multinode-containers.yaml
View File

@ -17,11 +17,8 @@ resource_registry:
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
# TODO(mandre) use the containerized service once we've reintroduced cinder
# OS::TripleO::Services::CinderBackup: ../../docker/services/pacemaker/cinder-backup.yaml
# OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::CinderBackup: ../../puppet/services/pacemaker/cinder-backup.yaml
OS::TripleO::Services::CinderVolume: ../../puppet/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::Keepalived: OS::Heat::None
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None

7
ci/environments/scenario002-multinode-containers.yaml
View File

@ -11,11 +11,8 @@ resource_registry:
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
# TODO(mandre) use the containerized service once we've reintroduced cinder
# OS::TripleO::Services::CinderBackup: ../../docker/services/pacemaker/cinder-backup.yaml
# OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::CinderBackup: ../../puppet/services/pacemaker/cinder-backup.yaml
OS::TripleO::Services::CinderVolume: ../../puppet/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::Keepalived: OS::Heat::None
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None