From 7ae7c668edab002d42fb533860a057e67fce2d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Fri, 15 May 2020 15:43:20 +0200 Subject: [PATCH] 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 --- roles/tripleo_container_image_list/tasks/main.yml | 2 ++ roles/tripleo_container_image_prepare_default/tasks/main.yml | 2 ++ roles/tripleo_container_image_show/tasks/main.yml | 2 ++ roles/tripleo_deploy/tasks/main.yml | 2 ++ roles/tripleo_overcloud_admin_authorize/tasks/main.yml | 2 ++ roles/tripleo_overcloud_cell_export/tasks/main.yml | 2 ++ roles/tripleo_overcloud_config_download/tasks/main.yml | 2 ++ roles/tripleo_overcloud_container_image_build/tasks/main.yml | 2 ++ roles/tripleo_overcloud_container_image_prepare/tasks/main.yml | 2 ++ .../tasks/main.yml | 2 ++ roles/tripleo_overcloud_container_image_upload/tasks/main.yml | 2 ++ roles/tripleo_overcloud_credentials/tasks/main.yml | 2 ++ roles/tripleo_overcloud_delete/tasks/main.yml | 2 ++ roles/tripleo_overcloud_deploy/tasks/main.yml | 2 ++ roles/tripleo_overcloud_export/tasks/main.yml | 2 ++ roles/tripleo_overcloud_external_update_run/tasks/main.yml | 2 ++ roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml | 2 ++ roles/tripleo_overcloud_failures/tasks/main.yml | 2 ++ roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml | 2 ++ roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml | 2 ++ roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml | 2 ++ roles/tripleo_overcloud_generate_fencing/tasks/main.yml | 2 ++ roles/tripleo_overcloud_image_upload/tasks/main.yml | 2 ++ roles/tripleo_overcloud_netenv_validate/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_bios_configure/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_bios_reset/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_clean/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_configure/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_delete/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_discover/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_import/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_introspect/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_provide/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_provision/tasks/main.yml | 2 ++ roles/tripleo_overcloud_node_unprovision/tasks/main.yml | 2 ++ roles/tripleo_overcloud_profiles_list/tasks/main.yml | 2 ++ roles/tripleo_overcloud_profiles_match/tasks/main.yml | 2 ++ roles/tripleo_overcloud_raid_create/tasks/main.yml | 2 ++ roles/tripleo_overcloud_roles_generate/tasks/main.yml | 2 ++ roles/tripleo_overcloud_roles_list/tasks/main.yml | 2 ++ roles/tripleo_overcloud_roles_show/tasks/main.yml | 2 ++ roles/tripleo_overcloud_status/tasks/main.yml | 2 ++ roles/tripleo_overcloud_support_report_collect/tasks/main.yml | 2 ++ roles/tripleo_overcloud_update_converge/tasks/main.yml | 2 ++ roles/tripleo_overcloud_update_prepare/tasks/main.yml | 2 ++ roles/tripleo_overcloud_update_run/tasks/main.yml | 2 ++ roles/tripleo_overcloud_upgrade_converge/tasks/main.yml | 2 ++ roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml | 2 ++ roles/tripleo_overcloud_upgrade_run/tasks/main.yml | 2 ++ 49 files changed, 98 insertions(+) diff --git a/roles/tripleo_container_image_list/tasks/main.yml b/roles/tripleo_container_image_list/tasks/main.yml index 272f469..23b26e5 100644 --- a/roles/tripleo_container_image_list/tasks/main.yml +++ b/roles/tripleo_container_image_list/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_container_image_prepare_default/tasks/main.yml b/roles/tripleo_container_image_prepare_default/tasks/main.yml index d4c93e1..27a9544 100644 --- a/roles/tripleo_container_image_prepare_default/tasks/main.yml +++ b/roles/tripleo_container_image_prepare_default/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_container_image_show/tasks/main.yml b/roles/tripleo_container_image_show/tasks/main.yml index e01300a..4f38a78 100644 --- a/roles/tripleo_container_image_show/tasks/main.yml +++ b/roles/tripleo_container_image_show/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_deploy/tasks/main.yml b/roles/tripleo_deploy/tasks/main.yml index cce6e08..faed3af 100644 --- a/roles/tripleo_deploy/tasks/main.yml +++ b/roles/tripleo_deploy/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_admin_authorize/tasks/main.yml b/roles/tripleo_overcloud_admin_authorize/tasks/main.yml index 9d2e513..5c8442d 100644 --- a/roles/tripleo_overcloud_admin_authorize/tasks/main.yml +++ b/roles/tripleo_overcloud_admin_authorize/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_cell_export/tasks/main.yml b/roles/tripleo_overcloud_cell_export/tasks/main.yml index 861e8c9..b000520 100644 --- a/roles/tripleo_overcloud_cell_export/tasks/main.yml +++ b/roles/tripleo_overcloud_cell_export/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_config_download/tasks/main.yml b/roles/tripleo_overcloud_config_download/tasks/main.yml index 7de5075..0af3b75 100644 --- a/roles/tripleo_overcloud_config_download/tasks/main.yml +++ b/roles/tripleo_overcloud_config_download/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_container_image_build/tasks/main.yml b/roles/tripleo_overcloud_container_image_build/tasks/main.yml index 24eaf00..6f57259 100644 --- a/roles/tripleo_overcloud_container_image_build/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_build/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml b/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml index 55694eb..0905c67 100644 --- a/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml b/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml index 6503d45..b1b0178 100644 --- a/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_container_image_upload/tasks/main.yml b/roles/tripleo_overcloud_container_image_upload/tasks/main.yml index f06f775..1e5610c 100644 --- a/roles/tripleo_overcloud_container_image_upload/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_upload/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_credentials/tasks/main.yml b/roles/tripleo_overcloud_credentials/tasks/main.yml index 3c02060..ac43752 100644 --- a/roles/tripleo_overcloud_credentials/tasks/main.yml +++ b/roles/tripleo_overcloud_credentials/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_delete/tasks/main.yml b/roles/tripleo_overcloud_delete/tasks/main.yml index d0456e3..d6f90b1 100644 --- a/roles/tripleo_overcloud_delete/tasks/main.yml +++ b/roles/tripleo_overcloud_delete/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_deploy/tasks/main.yml b/roles/tripleo_overcloud_deploy/tasks/main.yml index b5ac1b9..e7c45e9 100644 --- a/roles/tripleo_overcloud_deploy/tasks/main.yml +++ b/roles/tripleo_overcloud_deploy/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_export/tasks/main.yml b/roles/tripleo_overcloud_export/tasks/main.yml index 9b90e94..94f96e4 100644 --- a/roles/tripleo_overcloud_export/tasks/main.yml +++ b/roles/tripleo_overcloud_export/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_external_update_run/tasks/main.yml b/roles/tripleo_overcloud_external_update_run/tasks/main.yml index 0f23f2e..1099f1a 100644 --- a/roles/tripleo_overcloud_external_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_external_update_run/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml index a8e5f53..cdc2e34 100644 --- a/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_failures/tasks/main.yml b/roles/tripleo_overcloud_failures/tasks/main.yml index 7482566..0786877 100644 --- a/roles/tripleo_overcloud_failures/tasks/main.yml +++ b/roles/tripleo_overcloud_failures/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml index 219ac21..d10610a 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml index fec64ca..cf56c90 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml index bcab6d4..fdb4bb6 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_generate_fencing/tasks/main.yml b/roles/tripleo_overcloud_generate_fencing/tasks/main.yml index 8212b46..ee429f5 100644 --- a/roles/tripleo_overcloud_generate_fencing/tasks/main.yml +++ b/roles/tripleo_overcloud_generate_fencing/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_image_upload/tasks/main.yml b/roles/tripleo_overcloud_image_upload/tasks/main.yml index dec1cd3..74e6067 100644 --- a/roles/tripleo_overcloud_image_upload/tasks/main.yml +++ b/roles/tripleo_overcloud_image_upload/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_netenv_validate/tasks/main.yml b/roles/tripleo_overcloud_netenv_validate/tasks/main.yml index 06e9f39..17473f5 100644 --- a/roles/tripleo_overcloud_netenv_validate/tasks/main.yml +++ b/roles/tripleo_overcloud_netenv_validate/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml b/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml index d0b5aff..3e665cf 100644 --- a/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml +++ b/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_bios_reset/tasks/main.yml b/roles/tripleo_overcloud_node_bios_reset/tasks/main.yml index 7bfa44a..cf3f5fe 100644 --- a/roles/tripleo_overcloud_node_bios_reset/tasks/main.yml +++ b/roles/tripleo_overcloud_node_bios_reset/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_clean/tasks/main.yml b/roles/tripleo_overcloud_node_clean/tasks/main.yml index f56cfbe..367400f 100644 --- a/roles/tripleo_overcloud_node_clean/tasks/main.yml +++ b/roles/tripleo_overcloud_node_clean/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_configure/tasks/main.yml b/roles/tripleo_overcloud_node_configure/tasks/main.yml index a0463c1..12112f4 100644 --- a/roles/tripleo_overcloud_node_configure/tasks/main.yml +++ b/roles/tripleo_overcloud_node_configure/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_delete/tasks/main.yml b/roles/tripleo_overcloud_node_delete/tasks/main.yml index 38f2a8d..9843f6d 100644 --- a/roles/tripleo_overcloud_node_delete/tasks/main.yml +++ b/roles/tripleo_overcloud_node_delete/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_discover/tasks/main.yml b/roles/tripleo_overcloud_node_discover/tasks/main.yml index 00d6899..9879a5b 100644 --- a/roles/tripleo_overcloud_node_discover/tasks/main.yml +++ b/roles/tripleo_overcloud_node_discover/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_import/tasks/main.yml b/roles/tripleo_overcloud_node_import/tasks/main.yml index 3da432a..597da20 100644 --- a/roles/tripleo_overcloud_node_import/tasks/main.yml +++ b/roles/tripleo_overcloud_node_import/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_introspect/tasks/main.yml b/roles/tripleo_overcloud_node_introspect/tasks/main.yml index f427e01..39ce60c 100644 --- a/roles/tripleo_overcloud_node_introspect/tasks/main.yml +++ b/roles/tripleo_overcloud_node_introspect/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_provide/tasks/main.yml b/roles/tripleo_overcloud_node_provide/tasks/main.yml index 792f3e8..450343b 100644 --- a/roles/tripleo_overcloud_node_provide/tasks/main.yml +++ b/roles/tripleo_overcloud_node_provide/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_provision/tasks/main.yml b/roles/tripleo_overcloud_node_provision/tasks/main.yml index 13a65ae..0a300e2 100644 --- a/roles/tripleo_overcloud_node_provision/tasks/main.yml +++ b/roles/tripleo_overcloud_node_provision/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_node_unprovision/tasks/main.yml b/roles/tripleo_overcloud_node_unprovision/tasks/main.yml index 0cf514a..3ebf3b0 100644 --- a/roles/tripleo_overcloud_node_unprovision/tasks/main.yml +++ b/roles/tripleo_overcloud_node_unprovision/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_profiles_list/tasks/main.yml b/roles/tripleo_overcloud_profiles_list/tasks/main.yml index a702070..10b19ff 100644 --- a/roles/tripleo_overcloud_profiles_list/tasks/main.yml +++ b/roles/tripleo_overcloud_profiles_list/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_profiles_match/tasks/main.yml b/roles/tripleo_overcloud_profiles_match/tasks/main.yml index cce04a4..f841c38 100644 --- a/roles/tripleo_overcloud_profiles_match/tasks/main.yml +++ b/roles/tripleo_overcloud_profiles_match/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_raid_create/tasks/main.yml b/roles/tripleo_overcloud_raid_create/tasks/main.yml index 5267f48..6ba8c67 100644 --- a/roles/tripleo_overcloud_raid_create/tasks/main.yml +++ b/roles/tripleo_overcloud_raid_create/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_roles_generate/tasks/main.yml b/roles/tripleo_overcloud_roles_generate/tasks/main.yml index 007bc5b..6b33168 100644 --- a/roles/tripleo_overcloud_roles_generate/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_generate/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_roles_list/tasks/main.yml b/roles/tripleo_overcloud_roles_list/tasks/main.yml index 530b4cd..90ea147 100644 --- a/roles/tripleo_overcloud_roles_list/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_list/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_roles_show/tasks/main.yml b/roles/tripleo_overcloud_roles_show/tasks/main.yml index 715a811..6e0bc14 100644 --- a/roles/tripleo_overcloud_roles_show/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_show/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_status/tasks/main.yml b/roles/tripleo_overcloud_status/tasks/main.yml index a35c4b1..e1d89b3 100644 --- a/roles/tripleo_overcloud_status/tasks/main.yml +++ b/roles/tripleo_overcloud_status/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_support_report_collect/tasks/main.yml b/roles/tripleo_overcloud_support_report_collect/tasks/main.yml index 20e89c5..1975967 100644 --- a/roles/tripleo_overcloud_support_report_collect/tasks/main.yml +++ b/roles/tripleo_overcloud_support_report_collect/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_update_converge/tasks/main.yml b/roles/tripleo_overcloud_update_converge/tasks/main.yml index fe0409c..a094629 100644 --- a/roles/tripleo_overcloud_update_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_update_converge/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_update_prepare/tasks/main.yml b/roles/tripleo_overcloud_update_prepare/tasks/main.yml index c785360..782e78a 100644 --- a/roles/tripleo_overcloud_update_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_update_prepare/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_update_run/tasks/main.yml b/roles/tripleo_overcloud_update_run/tasks/main.yml index 7be1531..2597a2b 100644 --- a/roles/tripleo_overcloud_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_update_run/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml b/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml index 413be10..e8fb4cd 100644 --- a/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml b/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml index 95b7440..aa82bc1 100644 --- a/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml @@ -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 }}" diff --git a/roles/tripleo_overcloud_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_upgrade_run/tasks/main.yml index a33685d..c4be784 100644 --- a/roles/tripleo_overcloud_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_run/tasks/main.yml @@ -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 }}"