Browse Source

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

changes/67/788167/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
0dd389249e
1 changed files with 12 additions and 8 deletions
  1. +12
    -8
      tripleoclient/v1/overcloud_deploy.py

+ 12
- 8
tripleoclient/v1/overcloud_deploy.py View File

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


Loading…
Cancel
Save