diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-22 18:31:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-22 18:31:51 +0000 |
| commit | 27652e96a889b0350ee8024d6d332d40ace3952e (patch) | |
| tree | b1593ea50f67747f992e10e1b9b678e913bc3ea0 /ci/environments | |
| parent | ce9007529d5d2cce1e519aa81f37e68c41afb52e (diff) | |
| parent | 8cb4da7a1ed969bf8f44ebe39f5153141d5a3c5c (diff) | |
Merge "Zaqar: Match service name with service-net-map"
Diffstat (limited to 'ci/environments')
| -rw-r--r-- | ci/environments/scenario002-multinode-containers.yaml | 2 | ||||
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index fe06ef66..584c1e5e 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -11,7 +11,7 @@ resource_registry: OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.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::Zaqar: ../../puppet/services/zaqar-api.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 diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index 513d3f71..5670c213 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -2,7 +2,7 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml - OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml + OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar-api.yaml OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml |