diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-02 14:34:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-02 14:34:41 +0000 |
| commit | ae1a0e6ec0f99009ae2534c382f3123b305ce39b (patch) | |
| tree | c3fd4288e75fd27edc675d976e8a2e863ae3abc3 | |
| parent | ee86735b0c0b3d2cb90486347be285c7854a2aac (diff) | |
| parent | 26c229a4b585e13d959a4a2dd1c205b12e9ea625 (diff) | |
Merge "scenario001: deploy Cinder with RBD backend"
| -rw-r--r-- | ci/environments/scenario001-multinode.yaml | 4 | ||||
| -rw-r--r-- | ci/pingtests/scenario001-multinode.yaml | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index cb39d3b0..ee5bd648 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -53,6 +53,10 @@ parameter_defaults: - OS::TripleO::Services::CephMon - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CephClient + - OS::TripleO::Services::CinderApi + - OS::TripleO::Services::CinderBackup + - OS::TripleO::Services::CinderScheduler + - OS::TripleO::Services::CinderVolume ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml index 7374846f..ede83db0 100644 --- a/ci/pingtests/scenario001-multinode.yaml +++ b/ci/pingtests/scenario001-multinode.yaml @@ -72,12 +72,22 @@ resources: router_id: { get_resource: router } subnet_id: { get_resource: private_subnet } + volume1: + type: OS::Cinder::Volume + properties: + name: Volume1 + image: { get_param: image } + size: 1 + server1: type: OS::Nova::Server + depends_on: volume1 properties: name: Server1 + block_device_mapping: + - device_name: vda + volume_id: { get_resource: volume1 } flavor: { get_resource: test_flavor } - image: { get_param: image } key_name: { get_resource: key_pair } networks: - port: { get_resource: server1_port } |