From: Ethan Lynn <ethanlynnl@vmware.com>
Date: Wed, 3 May 2017 08:14:30 +0000 (+0800)
Subject: Attach second disk to sdc before booted
X-Git-Tag: 1.0.0-Amsterdam~317
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2d223894f6b3410518ffab6ca4a406dca16093d5;p=demo.git

Attach second disk to sdc before booted

Somce openstack env can't recognize second disk until OS is rebooted,
this patch directly attach the second disk to instance when it is
creating.

Change-Id: I54fed1dff37489d38862b03369ff72bd4dd1b84b
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
---

diff --git a/heat/OpenECOMP/onap_openstack_RC.yaml b/heat/OpenECOMP/onap_openstack_RC.yaml
index bb17f40d..0964349f 100644
--- a/heat/OpenECOMP/onap_openstack_RC.yaml
+++ b/heat/OpenECOMP/onap_openstack_RC.yaml
@@ -858,13 +858,6 @@ resources:
       name: vol1-sdc-data
       size: 100
 
-  sdc_volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: sdc_volume_data }
-      instance_uuid: { get_resource: sdc_vm }
-      mountpoint: /dev/vdb
-
   sdc_vm:
     type: OS::Nova::Server
     properties:
@@ -878,6 +871,9 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: sdc_private_port }
+      block_device_mapping:
+        - device_name: /dev/vdb
+          volume_id: {get_resource: sdc_volume_data}
       user_data_format: RAW
       user_data:
         str_replace: