diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-02 12:09:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-02 12:09:13 +0000 |
| commit | ee86735b0c0b3d2cb90486347be285c7854a2aac (patch) | |
| tree | 4cdd1e31aa4b3e4ef3a102c44cdc4c76d6d76e03 | |
| parent | 21303cd9fc8322bb505d5c5d6e5559b7aeedcce1 (diff) | |
| parent | c5a1ea17b818410b905a68a1935c77c4fcb00c35 (diff) | |
Merge "Add Zaqar to scenario002"
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 5 | ||||
| -rw-r--r-- | ci/pingtests/scenario002-multinode.yaml | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index b8bc5762..97fec24c 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -1,7 +1,8 @@ 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: /usr/share/openstack-tripleo-heat-templates/puppet/services/barbican-api.yaml + OS::TripleO::Services::BarbicanApi: ../../puppet/services/barbican-api.yaml + OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml parameter_defaults: ControllerServices: @@ -42,6 +43,8 @@ parameter_defaults: - OS::TripleO::Services::SwiftStorage - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::BarbicanApi + - OS::TripleO::Services::MongoDb + - OS::TripleO::Services::Zaqar ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu diff --git a/ci/pingtests/scenario002-multinode.yaml b/ci/pingtests/scenario002-multinode.yaml index d7a30fd9..1ab7eef9 100644 --- a/ci/pingtests/scenario002-multinode.yaml +++ b/ci/pingtests/scenario002-multinode.yaml @@ -144,6 +144,11 @@ resources: ram: 512 vcpus: 1 + zaqar_queue: + type: OS::Zaqar::Queue + properties: + name: pingtest-queue + outputs: server1_private_ip: description: IP address of server1 in private network |