Merge "Move nodes' fqdns to a map to remove clutter"

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

diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml
index 9dcbd39..ede83db 100644 (file)
--- 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 }
@@ -118,19 +128,21 @@ resources:
       ram: 512
       vcpus: 1
 
-  gnocchi_res_alarm:
-    type: OS::Aodh::GnocchiResourcesAlarm
-    properties:
-      description: Do stuff with gnocchi
-      metric: cpu_util
-      aggregation_method: mean
-      granularity: 60
-      evaluation_periods: 1
-      threshold: 50
-      alarm_actions: []
-      resource_type: instance
-      resource_id: { get_resource: server1 }
-      comparison_operator: gt
+# Disabling this resource now
+# https://bugs.launchpad.net/tripleo/+bug/1646506
+#  gnocchi_res_alarm:
+#    type: OS::Aodh::GnocchiResourcesAlarm
+#    properties:
+#      description: Do stuff with gnocchi
+#      metric: cpu_util
+#      aggregation_method: mean
+#      granularity: 60
+#      evaluation_periods: 1
+#      threshold: 50
+#      alarm_actions: []
+#      resource_type: instance
+#      resource_id: { get_resource: server1 }
+#      comparison_operator: gt
 
   asg:
     type: OS::Heat::AutoScalingGroup