openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Enable ConfigDebug for undercloud deployments"

This commit is contained in:
Zuul 2020-03-03 05:31:01 +00:00 committed by Gerrit Code Review
parent 104d57dc50 7bef443b73
commit e1bfeb1fd3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,17 @@ valid YAML. The default to_nice_yaml filter doesn't quote strings,
which can cause unexpected implicit type conversion when the
resulting YAML is consumed, whereas with JSON all strings are quoted.
#}
{% if undercloud_undercloud_debug | default(true) %}
{% set config_debug = {'parameter_defaults': {'ConfigDebug': true}} %}
{% else %}
{% set config_debug = {} %}
{% endif %}
{% if undercloud_resource_registry_args %}
{% set undercloud_resource_registry = {'resource_registry': undercloud_resource_registry_args} %}
{% else %}
{% set undercloud_resource_registry = {} %}
{% endif %}
{% set undercloud_parameter_defaults = {'parameter_defaults': undercloud_network_environment_args} %}
{{ undercloud_parameter_defaults|combine(undercloud_resource_registry, recursive=True)|to_nice_json }}
{{ undercloud_parameter_defaults|combine(undercloud_resource_registry, recursive=True)|combine(config_debug, recursive=True)|to_nice_json }}

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

@ -4,10 +4,17 @@ valid YAML. The default to_nice_yaml filter doesn't quote strings,
which can cause unexpected implicit type conversion when the
resulting YAML is consumed, whereas with JSON all strings are quoted.
#}
{% if minion_minion_debug | default(true) %}
{% set config_debug = {'parameter_defaults': {'ConfigDebug': true}} %}
{% else %}
{% set config_debug = {} %}
{% endif %}
{% if minion_resource_registry_args %}
{% set minion_resource_registry = {'resource_registry': minion_resource_registry_args} %}
{% else %}
{% set minion_resource_registry = {} %}
{% endif %}
{% set minion_parameter_defaults = {'parameter_defaults': minion_network_environment_args} %}
{{ minion_parameter_defaults|combine(minion_resource_registry, recursive=True)|to_nice_json }}
{{ minion_parameter_defaults|combine(minion_resource_registry, recursive=True)|combine(config_debug, recursive=True)|to_nice_json }}