Fix debug deploy arg for standalone

Set it default to False and fix the var name to become
standalone_tripleo_deploy_debug_arg.

Additionally, make ConfigDebug and DockerPuppetDebug extra debug settings
to be controlled by that parameter as well.

Depends-On: https://review.opendev.org/731128

Change-Id: I8c6b4baa50867d8f82c244ef755556e87e81c942
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2020-05-28 12:11:45 +02:00
parent 03a75eb6c9
commit bc5bfed247
5 changed files with 8 additions and 1 deletions

@ -37,6 +37,8 @@ Role Variables
- standalone_custom_env_files: <'[]'> -- list of additional environment files to be added to the deployment command (do not include the -e)
- standalone_tripleo_deploy_debug_arg: <False> -- makes tripleoclient invoked with --debug, that results in calling ansible -vv commands as well.
Dependencies
------------

@ -41,3 +41,5 @@ standalone_container_cli: docker
standalone_custom_env_files: []
standalone_container_ceph_updates: true
standalone_tripleo_deploy_debug_arg: false

@ -244,6 +244,7 @@
name: tripleo_deploy
vars:
tripleo_deploy_debug: true
tripleo_deploy_debug_arg: "{{ standalone_tripleo_deploy_debug_arg }}"
tripleo_deploy_local_ip: "{{ standalone_ip }}/{{ standalone_network_prefix }}"
tripleo_deploy_control_virtual_ip: "{{ standalone_control_virtual_ip|default() }}"
tripleo_deploy_roles_file: "{{ overcloud_templates_path }}/roles/{{ standalone_role }}"

@ -1,4 +1,4 @@
sudo openstack tripleo deploy {%- if tripleo_deploy_debug | bool -%}--debug{%-endif -%} \
sudo openstack tripleo deploy {%- if standalone_tripleo_deploy_debug_arg | bool -%}--debug{%-endif -%} \
--templates \
--local-ip={{ standalone_ip }}/{{ standalone_network_prefix }} \
-e {{ overcloud_templates_path }}/environments/standalone/standalone-tripleo.yaml \

@ -5,6 +5,8 @@ parameter_defaults:
ContainerImagePrepareDebug: true
ControlPlaneStaticRoutes: []
Debug: true
ConfigDebug: {{ standalone_tripleo_deploy_debug_arg }}
DockerPuppetDebug: {{ standalone_tripleo_deploy_debug_arg }}
DeploymentUser: {{ undercloud_user }}
DnsServers: {{ undercloud_undercloud_nameservers | to_json }}
{% if standalone_container_prep_updates is defined and standalone_container_prep_updates %}