create data disk for each node in virtual deploy 33/35433/1
authorAlex Yang <yangyang1@zte.com.cn>
Sat, 27 May 2017 03:44:03 +0000 (11:44 +0800)
committerAlex Yang <yangyang1@zte.com.cn>
Sat, 27 May 2017 03:44:03 +0000 (11:44 +0800)
Since the roles are assigned randomly now, data disk should be created
for every node.

Change-Id: Idd12191033844dad58676de65df0fbc99a51cfbc
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
deploy/environment.py

index 2adec49..a6ef4ab 100644 (file)
@@ -232,7 +232,8 @@ class VirtualEnvironment(DaisyEnvironmentBase):
 
         disks = [disk_file]
         ceph_disk_name = self.deploy_struct.get('ceph_disk_name', '')
-        if ceph_disk_name and ceph_disk_name != '/dev/sda' and 'CONTROLLER_LB' in roles:
+        # if ceph_disk_name and ceph_disk_name != '/dev/sda' and 'CONTROLLER_LB' in roles:
+        if ceph_disk_name and ceph_disk_name != '/dev/sda':
             ceph_size = self.deploy_struct.get('disks', {}).get('ceph', MIN_CEPH_DISK_SIZE)
             ceph_disk_file = path_join(self.storage_dir, name + '_data.qcow2')
             create_virtual_disk(ceph_disk_file, ceph_size)