X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fpingtests%2Fscenario002-multinode.yaml;h=7af1ba0c8b5fbcd523084a38dfc52bfd25f40cd3;hb=3c6ec654b45fa1490cd452404ada735397852e38;hp=2421988787bb0252eb5a49824e0ddaac260c5c75;hpb=c060af6901d8384d11afddb5cb3d74f42076cb84;p=apex-tripleo-heat-templates.git

diff --git a/ci/pingtests/scenario002-multinode.yaml b/ci/pingtests/scenario002-multinode.yaml
index 24219887..7af1ba0c 100644
--- a/ci/pingtests/scenario002-multinode.yaml
+++ b/ci/pingtests/scenario002-multinode.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2013-05-23
+heat_template_version: ocata
 
 description: >
   HOT template to created resources deployed by scenario002.
@@ -72,12 +72,28 @@ resources:
       router_id: { get_resource: router }
       subnet_id: { get_resource: private_subnet }
 
+  luks_volume_type:
+    type: OS::Cinder::VolumeType
+    properties:
+      name: LUKS
+
+  encrypted_volume_type:
+    type: OS::Cinder::EncryptedVolumeType
+    properties:
+      volume_type: {get_resource: luks_volume_type}
+      provider: nova.volume.encryptors.luks.LuksEncryptor
+      cipher: aes-xts-plain64
+      control_location: front-end
+      key_size: 256
+
   volume1:
     type: OS::Cinder::Volume
+    depends_on: encrypted_volume_type
     properties:
       name: Volume1
       image: { get_param: image }
       size: 1
+      volume_type: {get_resource: luks_volume_type}
 
   server1:
     type: OS::Nova::Server
@@ -128,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