aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-08-14 20:46:10 -0700
committerEmilien Macchi <emilien@redhat.com>2017-08-17 05:24:42 +0000
commitd3dfd28af523996dd2dc7f8b37e728fa9a50d533 (patch)
treefafd2cb4c554e1d34e1eeb0434c5e34fc4a47ce1 /ci
parent90682d3f4f88b59fa8294313d93b557762ae0fcd (diff)
scenario002/container: run Barbican non-containerized
... until https://review.openstack.org/#/c/474327 is merged. In the meantime, let's test the scenario with Barbican like before. Depends-On: Ib5c99482f62397fc5fb79a9dc537dfb06ee7f4df Change-Id: Ia96736ad3ddabd33c5ee4518a3f63bafeffcf391
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario002-multinode-containers.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index d300f77..a4752c4 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -8,6 +8,7 @@ resource_registry:
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
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