summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-12-01 12:37:04 -0500
committerEmilien Macchi <emilien@redhat.com>2016-12-01 16:05:50 -0500
commit26c229a4b585e13d959a4a2dd1c205b12e9ea625 (patch)
treed3a1f9917fbc9554e77880ed72b8e08ad91cd1bc /ci
parentadcb48823b274f1d5214f48131edb8b03106124c (diff)
scenario001: deploy Cinder with RBD backend
Improve scenario001 with Cinder + RBD coverage. Also remove Barbican bits, we don't deploy Barbican in scenario001, but 002. Change-Id: Ib9cadbefcb3ddcdb4812f47ff5496e74b2bd888d
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario001-multinode.yaml4
-rw-r--r--ci/pingtests/scenario001-multinode.yaml12
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 }