openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Use from_yaml filter if not mapping 

Try to use from_yaml filter on undercloud_parameter_defaults_args
if it is not a mapping value.

See: https://review.opendev.org/c/openstack/tripleo-quickstart/+/828089/11/config/general_config/featureset010.yml#97

Related-Bug: #1959726
Change-Id: I60012ef3c696e0880df76450c0ffc84091ef7aaf
This commit is contained in:
Harald Jensås 2022-03-22 04:54:57 +01:00 committed by Ronelle Landy
parent b8aec1e33d
commit 0dc4f9ac62
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2
View File

@ -8,7 +8,7 @@ resulting YAML is consumed, whereas with JSON all strings are quoted.
{% set _ = undercloud_parameter_defaults.update({'parameter_defaults': {}}) %}
{% set _ = undercloud_parameter_defaults.update({'resource_registry': {}}) %}
{% if undercloud_parameter_defaults_args is defined and undercloud_parameter_defaults_args %}
{% set _ = undercloud_parameter_defaults['parameter_defaults'].update(undercloud_parameter_defaults_args) %}
{% set _ = undercloud_parameter_defaults['parameter_defaults'].update(undercloud_parameter_defaults_args if undercloud_parameter_defaults_args is mapping else undercloud_parameter_defaults_args | from_yaml) %}
{% endif %}
{% if undercloud_network_environment_args is defined and undercloud_network_environment_args %}
{% set _ = undercloud_parameter_defaults['parameter_defaults'].update(undercloud_network_environment_args) %}