Merge "Fix debug deploy arg for standalone"

roles/standalone/README.md

@@ -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
 ------------
 

roles/standalone/defaults/main.yml

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

roles/standalone/tasks/main.yml

@@ -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 }}"

roles/standalone/templates/standalone.sh.j2

@@ -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 \

roles/standalone/templates/standalone_config.yaml.j2

@@ -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 %}