openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "[train-only] Trap empty role data" into stable/train

This commit is contained in:
Zuul 2021-04-24 06:45:04 +00:00 committed by Gerrit Code Review
parent 369280c82e 73d1ee2707
commit 0dd389249e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tripleoclient/v1/overcloud_deploy.py
View File

@ -120,14 +120,18 @@ class DeployOvercloud(command.Command):
if roledata: if roledata:
nbd_tls_key = 'nova::compute::libvirt::qemu::nbd_tls' nbd_tls_key = 'nova::compute::libvirt::qemu::nbd_tls'
for key in roledata: for key in roledata:
if nbd_tls_key in roledata[key]['config_settings']: if not roledata[key]:
nbd_tls = roledata[key][ # Probably an incomplete stack, ignore it.
'config_settings'][nbd_tls_key] continue
self.log.debug("use_tls_for_nbd=%s" % nbd_tls) config_settings = roledata[key].get('config_settings')
parameters['UseTLSTransportForNbd'] = nbd_tls if config_settings:
break nbd_tls = config_settings.get(nbd_tls_key)
else: if nbd_tls:
parameters['UseTLSTransportForNbd'] = False self.log.debug("use_tls_for_nbd=%s" % nbd_tls)
parameters['UseTLSTransportForNbd'] = nbd_tls
break
else:
parameters['UseTLSTransportForNbd'] = False
# Update parameters from commandline # Update parameters from commandline
for param, arg in param_args: for param, arg in param_args: