aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJanki Chhatbar <jchhatba@redhat.com>2017-07-07 11:50:28 +0530
committerEmilien Macchi <emilien@redhat.com>2017-08-25 17:24:25 +0000
commitab55169703b93339c6c7ea012d7fbc4313f56778 (patch)
treeb1142e8bb0e3d036e3a5d3b8548d4a2711cb1534 /ci
parent98f578b7789cb4edef1090574ab7ab854f886fed (diff)
Containarise Barbican API
This containerises Barbican API in TripleO Change-Id: Icc5e9841ea48c806af4db61cd6de5e9a7a40a988 Partial-Bug: 1668924 Depends-On: I6b5ec18ccdd51b90ff27ff7d4341260dfba71e4e (cherry picked from commit 6d338b809accea4d3ba09ca8363b1a97ed79b658)
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario002-multinode-containers.yaml8
1 files changed, 2 insertions, 6 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index 584c1e5..43acf6d 100644
--- 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