Ensure we export result only if we have an stdout

I841743fb6c2c24e4a3d86598f99322022b27804d introduced a sort of "dry-run"
capability to the operators, but it didn't take care of the possible
exposure of the shell stdout in a fact. Thus, if you enabled the
generate_scripts_only feature, your ansible run would fail on the
exposure, since the variable it refers to will not exist.

Change-Id: I07225e6b82199cf15860e55db6995c994da65931
This commit is contained in:
Cédric Jeanneret 2020-05-15 15:43:20 +02:00
parent 7dd68a353c
commit 7ae7c668ed
49 changed files with 98 additions and 0 deletions

View File

@ -31,5 +31,7 @@
changed_when: false
- name: Set output fact
when:
- tripleo_container_image_list_result.stdout is defined
set_fact:
tripleo_container_image_list_output: "{{ tripleo_container_image_list_result.stdout }}"

View File

@ -20,5 +20,7 @@
changed_when: true
- name: Set output variable
when:
- tripleo_container_image_prepare_default_result.stdout is defined
set_fact:
tripleo_container_image_prepare_default_output: "{{ tripleo_container_image_prepare_default_result.stdout }}"

View File

@ -30,5 +30,7 @@
changed_when: false
- name: Set output fact
when:
- tripleo_container_image_show_result.stdout is defined
set_fact:
tripleo_container_image_show_output: "{{ tripleo_container_image_show_result.stdout }}"

View File

@ -98,5 +98,7 @@
- not tripleo_deploy_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_deploy_result.stdout is defined
set_fact:
tripleo_deploy_output: "{{ tripleo_deploy_result.stdout }}"

View File

@ -54,5 +54,7 @@
- not tripleo_overcloud_admin_authorize_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_admin_authorize_result.stdout is defined
set_fact:
tripleo_overcloud_admin_authorize_output: "{{ tripleo_overcloud_admin_authorize_result.stdout }}"

View File

@ -58,5 +58,7 @@
- not tripleo_overcloud_cell_export_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_cell_export_result.stdout is defined
set_fact:
tripleo_overcloud_cell_export_output: "{{ tripleo_overcloud_cell_export_result.stdout }}"

View File

@ -57,5 +57,7 @@
- not tripleo_overcloud_config_download_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_config_download_result.stdout is defined
set_fact:
tripleo_overcloud_config_download_output: "{{ tripleo_overcloud_config_download_result.stdout }}"

View File

@ -54,5 +54,7 @@
- not tripleo_overcloud_container_image_build_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_container_image_build_result.stdout is defined
set_fact:
tripleo_overcloud_container_image_build_output: "{{ tripleo_overcloud_container_image_build_result.stdout }}"

View File

@ -78,5 +78,7 @@
- not tripleo_overcloud_container_image_prepare_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_container_image_prepare_result.stdout is defined
set_fact:
tripleo_overcloud_container_image_prepare_output: "{{ tripleo_overcloud_container_image_prepare_result.stdout }}"

View File

@ -51,5 +51,7 @@
- not tripleo_overcloud_container_image_tag_discover_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_container_image_tag_discover_result.stdout is defined
set_fact:
tripleo_overcloud_container_image_tag_discover_output: "{{ tripleo_overcloud_container_image_tag_discover_result.stdout }}"

View File

@ -50,5 +50,7 @@
- not tripleo_overcloud_container_image_upload_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_container_image_upload_result.stdout is defined
set_fact:
tripleo_overcloud_container_image_upload_output: "{{ tripleo_overcloud_container_image_upload_result.stdout }}"

View File

@ -52,5 +52,7 @@
- not tripleo_overcloud_credentials_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_credentials_result.stdout is defined
set_fact:
tripleo_overcloud_credentials_output: "{{ tripleo_overcloud_credentials_result.stdout }}"

View File

@ -52,5 +52,7 @@
- not tripleo_overcloud_delete_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_delete_result.stdout is defined
set_fact:
tripleo_overcloud_delete_output: "{{ tripleo_overcloud_delete_result.stdout }}"

View File

@ -105,5 +105,7 @@
- not tripleo_overcloud_deploy_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_deploy_result.stdout is defined
set_fact:
tripleo_overcloud_deploy_output: "{{ tripleo_overcloud_deploy_result.stdout }}"

View File

@ -45,5 +45,7 @@
- not tripleo_overcloud_export_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_export_result.stdout is defined
set_fact:
tripleo_overcloud_export_output: "{{ tripleo_overcloud_export_result.stdout }}"

View File

@ -59,5 +59,7 @@
- not tripleo_overcloud_external_update_run_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_external_update_run_result.stdout is defined
set_fact:
tripleo_overcloud_external_update_run_output: "{{ tripleo_overcloud_external_update_run_result.stdout }}"

View File

@ -59,5 +59,7 @@
- not tripleo_overcloud_external_upgrade_run_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_external_upgrade_run_result.stdout is defined
set_fact:
tripleo_overcloud_external_upgrade_run_output: "{{ tripleo_overcloud_external_upgrade_run_result.stdout }}"

View File

@ -30,5 +30,7 @@
changed_when: false
- name: Set output fact
when:
- tripleo_overcloud_failures_result.stdout is defined
set_fact:
tripleo_overcloud_failures_output: "{{ tripleo_overcloud_failures_result.stdout }}"

View File

@ -104,5 +104,7 @@
- not tripleo_overcloud_ffwd_upgrade_converge_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_ffwd_upgrade_converge_result.stdout is defined
set_fact:
tripleo_overcloud_ffwd_upgrade_converge_output: "{{ tripleo_overcloud_ffwd_upgrade_converge_result.stdout }}"

View File

@ -104,5 +104,7 @@
- not tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_ffwd_upgrade_prepare_result.stdout is defined
set_fact:
tripleo_overcloud_ffwd_upgrade_prepare_output: "{{ tripleo_overcloud_ffwd_upgrade_prepare_result.stdout }}"

View File

@ -55,5 +55,7 @@
- not tripleo_overcloud_ffwd_upgrade_run_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_ffwd_upgrade_run_result.stdout is defined
set_fact:
tripleo_overcloud_ffwd_upgrade_run_output: "{{ tripleo_overcloud_ffwd_upgrade_run_result.stdout }}"

View File

@ -62,5 +62,7 @@
- not tripleo_overcloud_generate_fencing_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_generate_fencing_result.stdout is defined
set_fact:
tripleo_overcloud_generate_fencing_output: "{{ tripleo_overcloud_generate_fencing_result.stdout }}"

View File

@ -68,5 +68,7 @@
- not tripleo_overcloud_image_upload_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_image_upload_result.stdout is defined
set_fact:
tripleo_overcloud_image_upload_output: "{{ tripleo_overcloud_image_upload_result.stdout }}"

View File

@ -49,5 +49,7 @@
- not tripleo_overcloud_netenv_validate_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_netenv_validate_result.stdout is defined
set_fact:
tripleo_overcloud_netenv_validate_output: "{{ tripleo_overcloud_netenv_validate_result.stdout }}"

View File

@ -44,5 +44,7 @@
- not tripleo_overcloud_node_bios_configure_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_node_bios_configure_result.stdout is defined
set_fact:
tripleo_overcloud_node_bios_configure_output: "{{ tripleo_overcloud_node_bios_configure_result.stdout }}"

View File

@ -29,5 +29,7 @@
changed_when: true
- name: Set output fact
when:
- tripleo_overcloud_node_bios_reset_result.stdout is defined
set_fact:
tripleo_overcloud_node_bios_reset_output: "{{ tripleo_overcloud_node_bios_reset_result.stdout }}"

View File

@ -29,5 +29,7 @@
changed_when: true
- name: Set output fact
when:
- tripleo_overcloud_node_clean_result.stdout is defined
set_fact:
tripleo_overcloud_node_clean_output: "{{ tripleo_overcloud_node_clean_result.stdout }}"

View File

@ -36,5 +36,7 @@
changed_when: true
- name: Set output fact
when:
- tripleo_overcloud_node_configure_result.stdout is defined
set_fact:
tripleo_overcloud_node_configure_output: "{{ tripleo_overcloud_node_configure_result.stdout }}"

View File

@ -48,5 +48,7 @@
- not tripleo_overcloud_node_delete_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_node_delete_result.stdout is defined
set_fact:
tripleo_overcloud_node_delete_output: "{{ tripleo_overcloud_node_delete_result.stdout }}"

View File

@ -52,5 +52,7 @@
- not tripleo_overcloud_node_discover_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_node_discover_result.stdout is defined
set_fact:
tripleo_overcloud_node_discover_output: "{{ tripleo_overcloud_node_discover_result.stdout }}"

View File

@ -53,5 +53,7 @@
when: not tripleo_overcloud_node_import_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_node_import_result.stdout is defined
set_fact:
tripleo_overcloud_node_import_output: "{{ tripleo_overcloud_node_import_result.stdout }}"

View File

@ -31,5 +31,7 @@
changed_when: true
- name: Set output fact
when:
- tripleo_overcloud_node_introspect_result.stdout is defined
set_fact:
tripleo_overcloud_node_introspect_output: "{{ tripleo_overcloud_node_introspect_result.stdout }}"

View File

@ -51,5 +51,7 @@
when: not ansible_check_mode|bool
- name: Set output fact
when:
- tripleo_overcloud_node_provide_result.stdout is defined
set_fact:
tripleo_overcloud_node_provide_output: "{{ tripleo_overcloud_node_provide_result.stdout }}"

View File

@ -55,5 +55,7 @@
- name: Set output fact
when:
- tripleo_overcloud_node_provision_result.stdout is defined
set_fact:
tripleo_overcloud_node_provision_output: "{{ tripleo_overcloud_node_provision_result.stdout }}"

View File

@ -45,5 +45,7 @@
when: not ansible_check_mode|bool
- name: Set output fact
when:
- tripleo_overcloud_node_unprovision_result.stdout is defined
set_fact:
tripleo_overcloud_node_unprovision_output: "{{ tripleo_overcloud_node_unprovision_result.stdout }}"

View File

@ -42,5 +42,7 @@
- not tripleo_overcloud_profiles_list_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_profiles_list_result.stdout is defined
set_fact:
tripleo_overcloud_profiles_list_output: "{{ tripleo_overcloud_profiles_list_result.stdout }}"

View File

@ -58,5 +58,7 @@
- not tripleo_overcloud_profiles_match_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_profiles_match_result.stdout is defined
set_fact:
tripleo_overcloud_profiles_match_output: "{{ tripleo_overcloud_profiles_match_result.stdout }}"

View File

@ -51,5 +51,7 @@
- not tripleo_overcloud_raid_create_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_raid_create_result.stdout is defined
set_fact:
tripleo_overcloud_raid_create_output: "{{ tripleo_overcloud_raid_create_result.stdout }}"

View File

@ -40,5 +40,7 @@
- not tripleo_overcloud_roles_generate_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_roles_generate_result.stdout is defined
set_fact:
tripleo_overcloud_roles_generate_output: "{{ tripleo_overcloud_roles_generate_result.stdout }}"

View File

@ -39,5 +39,7 @@
- not tripleo_overcloud_roles_list_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_roles_list_result.stdout is defined
set_fact:
tripleo_overcloud_roles_list_output: "{{ tripleo_overcloud_roles_list_result.stdout }}"

View File

@ -38,5 +38,7 @@
- not tripleo_overcloud_roles_show_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_roles_show_result.stdout is defined
set_fact:
tripleo_overcloud_roles_show_output: "{{ tripleo_overcloud_roles_show_result.stdout }}"

View File

@ -27,5 +27,7 @@
changed_when: false
- name: Set output fact
when:
- tripleo_overcloud_status_result.stdout is defined
set_fact:
tripleo_overcloud_status_output: "{{ tripleo_overcloud_status_result.stdout }}"

View File

@ -38,5 +38,7 @@
- not tripleo_overcloud_support_report_collect_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_support_report_collect_result.stdout is defined
set_fact:
tripleo_overcloud_support_report_collect_output: "{{ tripleo_overcloud_support_report_collect_result.stdout }}"

View File

@ -103,5 +103,7 @@
- not tripleo_overcloud_update_converge_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_update_converge_result.stdout is defined
set_fact:
tripleo_overcloud_update_converge_output: "{{ tripleo_overcloud_update_converge_result.stdout }}"

View File

@ -105,5 +105,7 @@
- not tripleo_overcloud_update_prepare_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_update_prepare_result.stdout is defined
set_fact:
tripleo_overcloud_update_prepare_output: "{{ tripleo_overcloud_update_prepare_result.stdout }}"

View File

@ -58,5 +58,7 @@
- not tripleo_overcloud_update_run_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_update_run_result.stdout is defined
set_fact:
tripleo_overcloud_update_run_output: "{{ tripleo_overcloud_update_run_result.stdout }}"

View File

@ -103,5 +103,7 @@
- not tripleo_overcloud_upgrade_converge_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_upgrade_converge_result.stdout is defined
set_fact:
tripleo_overcloud_upgrade_converge_output: "{{ tripleo_overcloud_upgrade_converge_result.stdout }}"

View File

@ -103,5 +103,7 @@
- not tripleo_overcloud_upgrade_prepare_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_upgrade_prepare_result.stdout is defined
set_fact:
tripleo_overcloud_upgrade_prepare_output: "{{ tripleo_overcloud_upgrade_prepare_result.stdout }}"

View File

@ -62,5 +62,7 @@
- not tripleo_overcloud_upgrade_run_generate_scripts_only|bool
- name: Set output fact
when:
- tripleo_overcloud_upgrade_run_result.stdout is defined
set_fact:
tripleo_overcloud_upgrade_run_output: "{{ tripleo_overcloud_upgrade_run_result.stdout }}"