RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33176 from jmolmo/bz_43972

Browse Source 
mgr/rook: Fix error creating OSD's

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-02-11 16:40:19 +01:00 committed by GitHub
commit a8e3fdfa6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pybind/mgr/rook/rook_cluster.py
View File

@ -528,7 +528,7 @@ class RookCluster(object):
"config": { "storeType": drive_group.objectstore }}
if block_devices:
pd["devices"] = [{'name': d} for d in block_devices]
pd["devices"] = [{'name': d.path} for d in block_devices]
if directories:
pd["directories"] = [{'path': p} for p in directories]
@ -551,16 +551,16 @@ class RookCluster(object):
patch.append({
"op": "add",
"path": "/spec/storage/nodes/{0}/devices/-".format(node_idx),
"value": {'name': n} # type: ignore
})
new_dirs = list(set(directories) - set(current_node['directories']))
for p in new_dirs:
patch.append({
"op": "add",
"path": "/spec/storage/nodes/{0}/directories/-".format(node_idx),
"value": {'path': p} # type: ignore
"value": {'name': n.path} # type: ignore
})
if directories:
new_dirs = list(set(directories) - set(current_node['directories']))
for p in new_dirs:
patch.append({
"op": "add",
"path": "/spec/storage/nodes/{0}/directories/-".format(node_idx),
"value": {'path': p} # type: ignore
})
if len(patch) == 0:
return "No change"