x/vmware-nsx
Code Issues Proposed changes

V2T migration: ensure dvs.ca_file is set for admin shell

Browse Source 
Ensure the the ca_file value for validating vCenter server
certificate is alway set when running V2T pre-migration
validation.

The ca_file parameter is set to a particular default value as it
would otherwise default to None

Change-Id: I5b640e47c644dc5c5352b3c7ef80bbb1a7470d34
This commit is contained in:
Salvatore Orlando 2021-03-31 10:06:58 -07:00
parent 5d5cab6e99
commit e643f01d14
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx/shell/admin/plugins/nsxv/resources/migration.py
View File

@ -519,7 +519,6 @@ def _validate_config():
@admin_utils.output_header @admin_utils.output_header
def validate_config_for_migration(resource, event, trigger, **kwargs): def validate_config_for_migration(resource, event, trigger, **kwargs):
"""Validate the nsxv configuration before migration to nsx-t""" """Validate the nsxv configuration before migration to nsx-t"""
# Read the command line parameters # Read the command line parameters
transit_networks = ["100.64.0.0/16"] transit_networks = ["100.64.0.0/16"]
strict = False strict = False
@ -533,6 +532,13 @@ def validate_config_for_migration(resource, event, trigger, **kwargs):
strict = bool(properties.get('strict', 'false').lower() == 'true') strict = bool(properties.get('strict', 'false').lower() == 'true')
out_file = properties.get('summary-file-name') out_file = properties.get('summary-file-name')
# Ensure ca_file in DVS section is always set otherwise secure connection
# to vcenter will fail
if not cfg.CONF.dvs.ca_file:
ca_file_default = "/etc/ssl/certs/vcenter.pem"
LOG.info("ca_file for vCenter unset, defaulting to: %s",
ca_file_default)
cfg.CONF.set_override('ca_file', ca_file_default, 'dvs')
LOG.info("Running migration config validation in %sstrict mode", LOG.info("Running migration config validation in %sstrict mode",
'' if strict else 'non-') '' if strict else 'non-')