summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-05-27 03:55:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-27 03:55:08 +0000
commiteef7d5543504f1645c656d0e2c37fed731e91a96 (patch)
treea12f2052e4b2787e5f1907ca9e89a27186300a1f
parentca38f70ab8d7d91190f9d0a9ec2c84e804883f1c (diff)
parent8caaf77cba9733f0e5afdce4e2fbe57c48b44817 (diff)
Merge "create data disk for each node in virtual deploy"
-rw-r--r--deploy/environment.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/deploy/environment.py b/deploy/environment.py
index 2adec494..a6ef4ab5 100644
--- a/deploy/environment.py
+++ b/deploy/environment.py
@@ -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)