x
/
daisycloud-core
Code Issues Proposed changes

fix bug of uuid can not generate and add ceph partition check 

Change-Id: I7fa8e4e594a58abe6f6d0ed2add2fc38021c8a9a
This commit is contained in:
Zhou Ya 2017-04-06 15:27:05 +08:00
parent 215596a214
commit dacb864ec3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/daisy/daisy/api/backends/kolla/config.py
View File

@ -208,7 +208,8 @@ def enable_cinder_backend(req, cluster_id, config_data):
config_lvm_for_cinder(config_data)
elif disk.get('service', None) == 'cinder' and\
disk.get('protocol_type', None) == 'CEPH':
disk.get('protocol_type', None) == 'CEPH' and\
disk.get('partition') != None:
config_ceph_for_cinder(config_data, disk)
@ -307,7 +308,7 @@ def update_password_yml():
continue
if k in uuid_keys:
passwords[k] = str(uuid.uuid4())
if k in keystone_admin_password:
elif k in keystone_admin_password:
passwords[k] = "keystone"
else:
passwords[k] = ''.join([