Merge "Fix manila backend_names and enable_protocols"

This commit is contained in:
Zuul 2021-03-26 05:04:10 +00:00 committed by Gerrit Code Review
commit 6c4d89c290

View File

@ -44,12 +44,12 @@ class ShareService(VersionedService):
"pools - storage back-ends can't be discovered.") "pools - storage back-ends can't be discovered.")
return return
if pools: if pools:
backends = [] backends = set()
enable_protocols = [] enable_protocols = set()
for pool in pools: for pool in pools:
backends.append(pool['backend']) backends.add(pool['backend'])
protocol = pool['capabilities']['storage_protocol'].lower() protocol = pool['capabilities']['storage_protocol'].lower()
enable_protocols.extend(protocol.split('_')) enable_protocols.update(protocol.split('_'))
conf.set('share', 'backend_names', ','.join(backends)) conf.set('share', 'backend_names', ','.join(backends))
conf.set('share', 'enable_protocols', ','.join(enable_protocols)) conf.set('share', 'enable_protocols', ','.join(enable_protocols))