Merge "Containerize cinder services under pacemaker in CI"

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

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

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