Merge "Increase default RabbitMQ/Erlang TCP timeout from 5 to 15 seconds"

[apex-tripleo-heat-templates.git] / ci / pingtests / scenario002-multinode.yaml

diff --git a/ci/pingtests/scenario002-multinode.yaml b/ci/pingtests/scenario002-multinode.yaml
index 2421988..72aac4c 100644 (file)
--- 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: pike
 
 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: luks
+      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