aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-18 23:48:48 +0000
committerGerrit Code Review <review@openstack.org>2017-08-18 23:48:48 +0000
commit47aff8d897509ce39d9ee69ef04e8916d9794c14 (patch)
tree6c13b25e44c2db9b6eadc8d02e8512cd12ecb42a /ci
parent496e977fc48dc749cead9588bc3a628ad77b58fa (diff)
parent26789ee5b387d22a531079295599fe6ed9f016ef (diff)
Merge "scenario002/multinode: do not run containerized Zaqar"
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario002-multinode-containers.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index a4752c4..fe06ef6 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -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