aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-18 23:37:28 +0000
committerGerrit Code Review <review@openstack.org>2017-08-18 23:37:28 +0000
commit496e977fc48dc749cead9588bc3a628ad77b58fa (patch)
treeac4eb708f2721eefd394f7881b962b23afa62b81 /ci
parentb0559c9db709f14dfccd4d01c27b4ab38daa8b2e (diff)
parentd3dfd28af523996dd2dc7f8b37e728fa9a50d533 (diff)
Merge "scenario002/container: run Barbican non-containerized"
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