Merge "Add DockerPuppetProcessCount defaults to 3" 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..43acf6d 100644 (file)
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -6,12 +6,8 @@
 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
   # NOTE: This is needed because of upgrades from Ocata to Pike. We
   # deploy the initial environment with Ocata templates, and