openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Allow jinja2 templates in preflight validation"

This commit is contained in:
Zuul 2022-04-18 21:07:01 +00:00 committed by Gerrit Code Review
parent c0943087b2 246d1e6fe4
commit 810164ce9c
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/v1/undercloud_config.py
View File

@ -443,6 +443,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
env_data = {}
registry_overwrites = {}
deploy_args = []
net_config_yaml = None
# Fetch configuration and use its log file param to add logging to a file
utils.load_config(CONF, constants.UNDERCLOUD_CONF_PATH)
utils.configure_logging(LOG, verbose_level, CONF['undercloud_log_file'])
@ -766,17 +767,17 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
os.path.split(data_file)[-1]).render(context).replace(
"'", '"').replace('"', '"')
try:
net_config_json = yaml.safe_load(net_config_str)
net_config_yaml = yaml.safe_load(net_config_str)
except ValueError:
net_config_json = yaml.safe_load("{%s}" % net_config_str)
net_config_yaml = yaml.safe_load("{%s}" % net_config_str)
if 'network_config' not in net_config_json:
if 'network_config' not in net_config_yaml:
msg = ('Unsupported data format in net_config_override '
'file %s: %s' % (data_file, net_config_str))
LOG.error(msg)
raise exceptions.DeploymentError(msg)
env_data['UndercloudNetConfigOverride'] = net_config_json
env_data['UndercloudNetConfigOverride'] = net_config_yaml
params_file = os.path.join(tempdir, 'undercloud_parameters.yaml')
utils.write_env_file(env_data, params_file, registry_overwrites)
@ -795,7 +796,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ['--hieradata-override=%s' % data_file]
if CONF.get('enable_validations') and not no_validations:
undercloud_preflight.check(verbose_level, upgrade)
undercloud_preflight.check(verbose_level, upgrade, net_config_yaml)
deploy_args += ['-e', os.path.join(
tht_templates, "environments/tripleo-validations.yaml")]

8
tripleoclient/v1/undercloud_preflight.py
View File

@ -285,7 +285,7 @@ def _validate_interface_exists(config_var='local_interface'):
raise FailedValidation(message)
def _validate_no_ip_change():
def _validate_no_ip_change(net_config_yaml=None):
"""Disallow provisioning interface IP changes
Changing the provisioning network IP causes a number of issues, so we
@ -293,7 +293,7 @@ def _validate_no_ip_change():
be changed.
"""
if CONF.net_config_override:
os_net_config_file = CONF.net_config_override
os_net_config_file = net_config_yaml
else:
os_net_config_file = '/etc/os-net-config/config.yaml'
@ -496,7 +496,7 @@ def _check_all_or_no_subnets_use_dns_nameservers():
raise FailedValidation(message)
def check(verbose_level, upgrade=False):
def check(verbose_level, upgrade=False, net_config_yaml=None):
# Fetch configuration and use its log file param to add logging to a file
utils.load_config(CONF, constants.UNDERCLOUD_CONF_PATH)
utils.configure_logging(LOG, verbose_level, CONF['undercloud_log_file'])
@ -539,7 +539,7 @@ def check(verbose_level, upgrade=False):
_checking_status('Network interfaces')
_validate_interface_exists()
_checking_status('Provisioning IP change')
_validate_no_ip_change()
_validate_no_ip_change(net_config_yaml)
_checking_status('Architecture')
_validate_architecure_options()
except KeyError as e: