summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-06-22 15:59:52 -0400
committerJiri Stransky <jistr@redhat.com>2017-06-23 12:34:47 +0200
commitfc7a6ea39dabedb95cc52dce82abcd8f33345637 (patch)
tree8df6ac9593beffc560ce5400859f9ab5d5bd758b /ci
parent83ed275fae1b442fce10ef2b2faa12c2e62a1028 (diff)
scenario002: containerize services for CI
Change-Id: I9f9a9dcf1666b5b0475bc8fae5b785747480b7d6
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario002-multinode-containers.yaml7
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index 7191deae..92c834b6 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -6,9 +6,10 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
- OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml
- OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
- OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.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::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
# overcloud-resource-registry.yaml there doesn't have this Docker