From: Emilien Macchi Date: Tue, 15 Aug 2017 03:46:10 +0000 (-0700) Subject: scenario002/container: run Barbican non-containerized X-Git-Tag: opnfv-6.0.0~216^2~2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d3dfd28af523996dd2dc7f8b37e728fa9a50d533;p=apex-tripleo-heat-templates.git 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 --- diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index d300f773..a4752c4c 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