openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "scenario002/multinode: do not run containerized Zaqar"

This commit is contained in:
Jenkins 2017-08-18 23:48:48 +00:00 committed by Gerrit Code Review
parent 496e977fc4 26789ee5b3
commit 47aff8d897
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/environments/scenario002-multinode-containers.yaml
View File

@ -9,7 +9,9 @@ resource_registry:
# 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
# TODO: Zaqar doesn't work when containerized
# https://bugs.launchpad.net/tripleo/+bug/1710959
OS::TripleO::Services::Zaqar: ../../puppet/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