From 17d34888958c892cbf8fda6ef89e323ed1075076 Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Wed, 1 Nov 2017 12:14:57 -0400 Subject: [PATCH] Containerize cinder services under pacemaker in CI 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 --- ci/environments/multinode-containers.yaml | 4 +--- ci/environments/scenario001-multinode-containers.yaml | 7 ++----- ci/environments/scenario002-multinode-containers.yaml | 7 ++----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 89a489b419..09c8758bfa 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -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 diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 3db265b479..51db2cd5b4 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -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 diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index a537026c31..9e3b906d8e 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -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