openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Revert "Enable ConfigDebug for undercloud deployments"

Browse Source 
We don't need/want the ConfigDebug enabled by default, too verbose.

This reverts commit 7bef443b73.

Change-Id: I167d00ee812f8442a3f2294a2bdad01ec8a9c052
This commit is contained in:
Emilien Macchi
2020-04-09 18:25:25 +00:00
parent 7d48d0bca1
commit cb6c9c47c8
2 changed files with 2 additions and 16 deletions
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,17 +4,10 @@ valid YAML. The default to_nice_yaml filter doesn't quote strings,
which can cause unexpected implicit type conversion when the which can cause unexpected implicit type conversion when the
resulting YAML is consumed, whereas with JSON all strings are quoted. 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 %} {% if undercloud_resource_registry_args %}
{% set undercloud_resource_registry = {'resource_registry': undercloud_resource_registry_args} %} {% set undercloud_resource_registry = {'resource_registry': undercloud_resource_registry_args} %}
{% else %} {% else %}
{% set undercloud_resource_registry = {} %} {% set undercloud_resource_registry = {} %}
{% endif %} {% endif %}
{% set undercloud_parameter_defaults = {'parameter_defaults': undercloud_network_environment_args} %} {% set undercloud_parameter_defaults = {'parameter_defaults': undercloud_network_environment_args} %}
{{ undercloud_parameter_defaults|combine(undercloud_resource_registry, recursive=True)|combine(config_debug, recursive=True)|to_nice_json }} {{ undercloud_parameter_defaults|combine(undercloud_resource_registry, recursive=True)|to_nice_json }}

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

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