Merge "Add all services to scenario004-containers" into stable/pike

[apex-tripleo-heat-templates.git] / ci / environments / scenario002-multinode-containers.yaml

diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index 584c1e5..0ca67d0 100644 (file)
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -6,13 +6,10 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  # TODO: Barbican is not yet containerized: https://review.openstack.org/#/c/474327
-  # OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml
-  OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
-  # TODO: Zaqar doesn't work when containerized
-  # https://bugs.launchpad.net/tripleo/+bug/1710959
-  OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml
+  OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml
+  OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml
   OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml
+  OS::TripleO::Services::MongoDb: ../../docker/services/database/mongodb.yaml
   # NOTE: This is needed because of upgrades from Ocata to Pike. We
   # deploy the initial environment with Ocata templates, and
   # overcloud-resource-registry.yaml there doesn't have this Docker
@@ -26,6 +23,7 @@ resource_registry:
 
 parameter_defaults:
   ControllerServices:
+    - OS::TripleO::Services::Clustercheck
     - OS::TripleO::Services::Docker
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Keystone