From 5a73e0a71864659311578321efea432edc7b3b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Mon, 11 May 2020 14:34:57 +0200 Subject: [PATCH] Add new parameter in order to get a kind of dry-run A new global parameter is introduced: tripleo_generate_scripts_only It allows to get the roles running as usual, but it won't actually execute the "shell" module. With the "tripleo_generate_scripts", it allows to get everything ready for manual investigations, with the generated scripts ready. Of course, every role can be instructed to only generate scripts, using the standard _generate_scripts_only parameter. Change-Id: I841743fb6c2c24e4a3d86598f99322022b27804d --- roles/tripleo_config_generate_ansible/README.md | 1 + roles/tripleo_config_generate_ansible/defaults/main.yml | 1 + roles/tripleo_config_generate_ansible/tasks/main.yml | 3 +++ roles/tripleo_deploy/README.md | 2 +- roles/tripleo_deploy/defaults/main.yml | 1 + roles/tripleo_deploy/tasks/main.yml | 4 +++- roles/tripleo_overcloud_admin_authorize/README.md | 1 + roles/tripleo_overcloud_admin_authorize/defaults/main.yml | 1 + roles/tripleo_overcloud_admin_authorize/tasks/main.yml | 3 +++ roles/tripleo_overcloud_cell_export/README.md | 1 + roles/tripleo_overcloud_cell_export/defaults/main.yml | 1 + roles/tripleo_overcloud_cell_export/tasks/main.yml | 5 +++-- roles/tripleo_overcloud_config_download/README.md | 1 + roles/tripleo_overcloud_config_download/defaults/main.yml | 1 + roles/tripleo_overcloud_config_download/tasks/main.yml | 5 +++-- roles/tripleo_overcloud_container_image_build/README.md | 1 + .../defaults/main.yml | 1 + roles/tripleo_overcloud_container_image_build/tasks/main.yml | 4 +++- roles/tripleo_overcloud_container_image_prepare/README.md | 1 + .../defaults/main.yml | 1 + .../tripleo_overcloud_container_image_prepare/tasks/main.yml | 5 +++-- .../tripleo_overcloud_container_image_tag_discover/README.md | 1 + .../defaults/main.yml | 1 + .../tasks/main.yml | 5 +++-- roles/tripleo_overcloud_container_image_upload/README.md | 1 + .../defaults/main.yml | 1 + .../tripleo_overcloud_container_image_upload/tasks/main.yml | 5 +++-- roles/tripleo_overcloud_credentials/README.md | 1 + roles/tripleo_overcloud_credentials/defaults/main.yml | 1 + roles/tripleo_overcloud_credentials/tasks/main.yml | 4 +++- roles/tripleo_overcloud_delete/README.md | 1 + roles/tripleo_overcloud_delete/defaults/main.yml | 1 + roles/tripleo_overcloud_delete/tasks/main.yml | 5 +++-- roles/tripleo_overcloud_deploy/README.md | 1 + roles/tripleo_overcloud_deploy/defaults/main.yml | 1 + roles/tripleo_overcloud_deploy/tasks/main.yml | 4 +++- roles/tripleo_overcloud_export/README.md | 1 + roles/tripleo_overcloud_export/defaults/main.yml | 1 + roles/tripleo_overcloud_export/tasks/main.yml | 3 +++ roles/tripleo_overcloud_external_update_run/README.md | 1 + .../tripleo_overcloud_external_update_run/defaults/main.yml | 1 + roles/tripleo_overcloud_external_update_run/tasks/main.yml | 4 +++- roles/tripleo_overcloud_external_upgrade_run/README.md | 1 + .../tripleo_overcloud_external_upgrade_run/defaults/main.yml | 1 + roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml | 4 +++- roles/tripleo_overcloud_ffwd_upgrade_converge/README.md | 1 + .../defaults/main.yml | 1 + roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml | 4 +++- roles/tripleo_overcloud_ffwd_upgrade_prepare/README.md | 1 + .../tripleo_overcloud_ffwd_upgrade_prepare/defaults/main.yml | 1 + roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml | 4 +++- roles/tripleo_overcloud_ffwd_upgrade_run/README.md | 1 + roles/tripleo_overcloud_ffwd_upgrade_run/defaults/main.yml | 1 + roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml | 4 +++- roles/tripleo_overcloud_generate_fencing/README.md | 1 + roles/tripleo_overcloud_generate_fencing/defaults/main.yml | 1 + roles/tripleo_overcloud_generate_fencing/tasks/main.yml | 4 +++- roles/tripleo_overcloud_image_build/README.md | 1 + roles/tripleo_overcloud_image_build/defaults/main.yml | 1 + roles/tripleo_overcloud_image_build/tasks/main.yml | 3 +++ roles/tripleo_overcloud_image_upload/README.md | 1 + roles/tripleo_overcloud_image_upload/defaults/main.yml | 1 + roles/tripleo_overcloud_image_upload/tasks/main.yml | 3 +++ roles/tripleo_overcloud_netenv_validate/README.md | 1 + roles/tripleo_overcloud_netenv_validate/defaults/main.yml | 1 + roles/tripleo_overcloud_netenv_validate/tasks/main.yml | 5 +++-- .../tripleo_overcloud_node_bios_configure/defaults/main.yml | 1 + roles/tripleo_overcloud_node_bios_configure/tasks/main.yml | 3 +++ roles/tripleo_overcloud_node_delete/README.md | 1 + roles/tripleo_overcloud_node_delete/defaults/main.yml | 1 + roles/tripleo_overcloud_node_delete/tasks/main.yml | 3 +++ roles/tripleo_overcloud_node_discover/defaults/main.yml | 1 + roles/tripleo_overcloud_node_discover/tasks/main.yml | 3 +++ roles/tripleo_overcloud_node_import/README.md | 1 + roles/tripleo_overcloud_node_import/defaults/main.yml | 1 + roles/tripleo_overcloud_node_import/tasks/main.yml | 1 + roles/tripleo_overcloud_node_provision/README.md | 1 + roles/tripleo_overcloud_profiles_list/README.md | 1 + roles/tripleo_overcloud_profiles_list/defaults/main.yml | 1 + roles/tripleo_overcloud_profiles_list/tasks/main.yml | 3 +++ roles/tripleo_overcloud_profiles_match/README.md | 1 + roles/tripleo_overcloud_profiles_match/defaults/main.yml | 1 + roles/tripleo_overcloud_profiles_match/tasks/main.yml | 3 +++ roles/tripleo_overcloud_raid_create/README.md | 1 + roles/tripleo_overcloud_raid_create/defaults/main.yml | 1 + roles/tripleo_overcloud_raid_create/tasks/main.yml | 4 +++- roles/tripleo_overcloud_roles_generate/README.md | 1 + roles/tripleo_overcloud_roles_generate/defaults/main.yml | 1 + roles/tripleo_overcloud_roles_generate/tasks/main.yml | 3 +++ roles/tripleo_overcloud_roles_list/README.md | 1 + roles/tripleo_overcloud_roles_list/defaults/main.yml | 1 + roles/tripleo_overcloud_roles_list/tasks/main.yml | 3 +++ roles/tripleo_overcloud_roles_show/README.md | 1 + roles/tripleo_overcloud_roles_show/defaults/main.yml | 1 + roles/tripleo_overcloud_roles_show/tasks/main.yml | 3 +++ roles/tripleo_overcloud_support_report_collect/README.md | 1 + .../defaults/main.yml | 1 + .../tripleo_overcloud_support_report_collect/tasks/main.yml | 3 +++ roles/tripleo_overcloud_update_converge/README.md | 1 + roles/tripleo_overcloud_update_converge/defaults/main.yml | 1 + roles/tripleo_overcloud_update_converge/tasks/main.yml | 4 +++- roles/tripleo_overcloud_update_prepare/README.md | 1 + roles/tripleo_overcloud_update_prepare/defaults/main.yml | 1 + roles/tripleo_overcloud_update_prepare/tasks/main.yml | 4 +++- roles/tripleo_overcloud_update_run/README.md | 1 + roles/tripleo_overcloud_update_run/defaults/main.yml | 1 + roles/tripleo_overcloud_update_run/tasks/main.yml | 4 +++- roles/tripleo_overcloud_upgrade_converge/README.md | 1 + roles/tripleo_overcloud_upgrade_converge/defaults/main.yml | 1 + roles/tripleo_overcloud_upgrade_converge/tasks/main.yml | 4 +++- roles/tripleo_overcloud_upgrade_prepare/README.md | 1 + roles/tripleo_overcloud_upgrade_prepare/defaults/main.yml | 1 + roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml | 4 +++- roles/tripleo_overcloud_upgrade_run/README.md | 1 + roles/tripleo_overcloud_upgrade_run/defaults/main.yml | 1 + roles/tripleo_overcloud_upgrade_run/tasks/main.yml | 4 +++- roles/tripleo_undercloud_backup/README.md | 1 + roles/tripleo_undercloud_backup/defaults/main.yml | 1 + roles/tripleo_undercloud_backup/tasks/main.yml | 3 +++ roles/tripleo_undercloud_install/README.md | 1 + roles/tripleo_undercloud_install/defaults/main.yml | 1 + roles/tripleo_undercloud_install/tasks/main.yml | 3 +++ roles/tripleo_undercloud_minion_install/README.md | 1 + roles/tripleo_undercloud_minion_install/defaults/main.yml | 1 + roles/tripleo_undercloud_minion_install/tasks/main.yml | 3 +++ roles/tripleo_undercloud_minion_upgrade/README.md | 1 + roles/tripleo_undercloud_minion_upgrade/defaults/main.yml | 1 + roles/tripleo_undercloud_minion_upgrade/tasks/main.yml | 3 +++ roles/tripleo_undercloud_upgrade/README.md | 1 + roles/tripleo_undercloud_upgrade/defaults/main.yml | 1 + roles/tripleo_undercloud_upgrade/tasks/main.yml | 3 +++ 131 files changed, 217 insertions(+), 32 deletions(-) diff --git a/roles/tripleo_config_generate_ansible/README.md b/roles/tripleo_config_generate_ansible/README.md index b7cbd19..c2aa713 100644 --- a/roles/tripleo_config_generate_ansible/README.md +++ b/roles/tripleo_config_generate_ansible/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_config_generate_ansible_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_config_generate_ansible_deployment_user`: (String) Deployment user to use. Default: "{{ ansible_user }}" * `tripleo_config_generate_ansible_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_config_generate_ansible_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_config_generate_ansible_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_config_generate_ansible_home_dir`: (String) Directory to run the command in. This is the default location for the output if `tripleo_config_generate_ansible_output_dir` is not specified.. Default: "{{ ansible_env.HOME }}" * `tripleo_config_generate_ansible_os_cloud`: (String) OS_CLOUD value to use when running the command. If tripleo_os_cloud is defined, it will be the default. Otherwise the default is ''. This variable takes precedence over `tripleo_config_generate_ansible_rc_file`. * `tripleo_config_generate_ansible_output_dir`: (String) Directory to output ansible.cfg and ansible.log files. diff --git a/roles/tripleo_config_generate_ansible/defaults/main.yml b/roles/tripleo_config_generate_ansible/defaults/main.yml index 4b4d13a..49055b6 100644 --- a/roles/tripleo_config_generate_ansible/defaults/main.yml +++ b/roles/tripleo_config_generate_ansible/defaults/main.yml @@ -7,4 +7,5 @@ tripleo_config_generate_ansible_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_config_generate_ansible_output_dir: tripleo_config_generate_ansible_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/overcloudrc') }}" tripleo_config_generate_ansible_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_config_generate_ansible_generate_scripts_only: "{{ tripleo_scripts_only | default(False) }}" tripleo_config_generate_ansible_home_dir: "{{ ansible_env.HOME }}" diff --git a/roles/tripleo_config_generate_ansible/tasks/main.yml b/roles/tripleo_config_generate_ansible/tasks/main.yml index a224119..7b9d84d 100644 --- a/roles/tripleo_config_generate_ansible/tasks/main.yml +++ b/roles/tripleo_config_generate_ansible/tasks/main.yml @@ -36,3 +36,6 @@ environment: "{{ _generate_env }}" register: tripleo_config_generate_ansible_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_config_generate_ansible_generate_scripts_only|bool diff --git a/roles/tripleo_deploy/README.md b/roles/tripleo_deploy/README.md index 9c47af1..c4dcdc2 100644 --- a/roles/tripleo_deploy/README.md +++ b/roles/tripleo_deploy/README.md @@ -16,12 +16,12 @@ Role Variables * `tripleo_deploy_control_virtual_ip`: (String) Control plain VIP address. * `tripleo_deploy_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_deploy_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_deploy_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_deploy_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_deploy_deployment_python_interpreter`: (String) Path to a python interpreter for the deployment actions. * `tripleo_deploy_deployment_user`: (String) User who is executing the tripleo deployment via sudo. Defaults: "{{ ansible_env.USER }}" * `tripleo_deploy_environment_files`: (List) A list of environment file paths for the deployment. * `tripleo_deploy_force_stack_create`: (Boolean) Flag to force stack create. Default: false * `tripleo_deploy_force_stack_update`: (Boolean) Flag to force stack update. Default: false -* `tripleo_deploy_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By defaukt uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` isn't defined. * `tripleo_deploy_heat_api_port`: (Number) Heat API port to use for the installer. * `tripleo_deploy_heat_user`: (String) User to execute the non-privleged heat-all process. * `tripleo_deploy_hieradata_override`: (String) Path to hierdata override file. diff --git a/roles/tripleo_deploy/defaults/main.yml b/roles/tripleo_deploy/defaults/main.yml index 43f5150..d00cc97 100644 --- a/roles/tripleo_deploy/defaults/main.yml +++ b/roles/tripleo_deploy/defaults/main.yml @@ -11,6 +11,7 @@ tripleo_deploy_environment_files: [] tripleo_deploy_force_stack_create: false tripleo_deploy_force_stack_update: false tripleo_deploy_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_deploy_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_deploy_heat_api_port: tripleo_deploy_heat_user: tripleo_deploy_hieradata_override: diff --git a/roles/tripleo_deploy/tasks/main.yml b/roles/tripleo_deploy/tasks/main.yml index 49d7557..cce6e08 100644 --- a/roles/tripleo_deploy/tasks/main.yml +++ b/roles/tripleo_deploy/tasks/main.yml @@ -93,7 +93,9 @@ async: "{{ tripleo_deploy_timeout }}" poll: "{{ tripleo_deploy_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_deploy_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_admin_authorize/README.md b/roles/tripleo_overcloud_admin_authorize/README.md index 2dec292..f7ba5e8 100644 --- a/roles/tripleo_overcloud_admin_authorize/README.md +++ b/roles/tripleo_overcloud_admin_authorize/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_admin_authorize_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_admin_authorize_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_admin_authorize_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_admin_authorize_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_admin_authorize_home_dir`: (String) Location to execute the command in. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_admin_authorize_os_cloud`: (String) OS_CLOUD value to use when running the command. If tripleo_os_cloud is defined, it will be the default. Otherwise the default is ''. This variable takes precedence over `tripleo_overcloud_admin_authorize_rc_file`. * `tripleo_overcloud_admin_authorize_output_dir`: (String) Directory to output ansible.cfg and ansible.log files. If not specified, will output to the `tripleo_overcloud_admin_authorize_home_dir`. diff --git a/roles/tripleo_overcloud_admin_authorize/defaults/main.yml b/roles/tripleo_overcloud_admin_authorize/defaults/main.yml index 8b64be2..2c60114 100644 --- a/roles/tripleo_overcloud_admin_authorize/defaults/main.yml +++ b/roles/tripleo_overcloud_admin_authorize/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_admin_authorize_debug: false tripleo_overcloud_admin_authorize_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_admin_authorize_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_admin_authorize_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_admin_authorize_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_overcloud_admin_authorize_output_dir: diff --git a/roles/tripleo_overcloud_admin_authorize/tasks/main.yml b/roles/tripleo_overcloud_admin_authorize/tasks/main.yml index ff73fd7..9d2e513 100644 --- a/roles/tripleo_overcloud_admin_authorize/tasks/main.yml +++ b/roles/tripleo_overcloud_admin_authorize/tasks/main.yml @@ -49,6 +49,9 @@ poll: "{{ tripleo_overcloud_admin_authorize_poll }}" register: tripleo_overcloud_admin_authorize_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_admin_authorize_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_cell_export/README.md b/roles/tripleo_overcloud_cell_export/README.md index e43b982..5fc7d93 100644 --- a/roles/tripleo_overcloud_cell_export/README.md +++ b/roles/tripleo_overcloud_cell_export/README.md @@ -16,6 +16,7 @@ Role Variables * `tripleo_overcloud_cell_export_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_cell_export_force_overwrite`: (Boolean) Flag to overwrite the output file. Default: false * `tripleo_overcloud_cell_export_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_cell_export_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_cell_export_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_cell_export_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_cell_export_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_cell_export_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_cell_export/defaults/main.yml b/roles/tripleo_overcloud_cell_export/defaults/main.yml index a4ec079..aca5d68 100644 --- a/roles/tripleo_overcloud_cell_export/defaults/main.yml +++ b/roles/tripleo_overcloud_cell_export/defaults/main.yml @@ -6,6 +6,7 @@ tripleo_overcloud_cell_export_control_plane_stack: tripleo_overcloud_cell_export_debug: false tripleo_overcloud_cell_export_force_overwrite: false tripleo_overcloud_cell_export_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_cell_export_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_cell_export_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_cell_export_log: "{{ tripleo_overcloud_cell_export_home_dir }}/overcloud_cell_export.log" tripleo_overcloud_cell_export_log_combine: true diff --git a/roles/tripleo_overcloud_cell_export/tasks/main.yml b/roles/tripleo_overcloud_cell_export/tasks/main.yml index c40689a..861e8c9 100644 --- a/roles/tripleo_overcloud_cell_export/tasks/main.yml +++ b/roles/tripleo_overcloud_cell_export/tasks/main.yml @@ -53,8 +53,9 @@ async: "{{ tripleo_overcloud_cell_export_timeout }}" poll: "{{ tripleo_overcloud_cell_export_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_cell_export_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_config_download/README.md b/roles/tripleo_overcloud_config_download/README.md index 7f261f3..db610d3 100644 --- a/roles/tripleo_overcloud_config_download/README.md +++ b/roles/tripleo_overcloud_config_download/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_overcloud_config_download_config_type`: (String) Type of object config to extract from the deployment * `tripleo_overcloud_config_download_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_config_download_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_config_download_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_config_download_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_config_download_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_config_download_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_config_download_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_config_download/defaults/main.yml b/roles/tripleo_overcloud_config_download/defaults/main.yml index 8856017..5deaca4 100644 --- a/roles/tripleo_overcloud_config_download/defaults/main.yml +++ b/roles/tripleo_overcloud_config_download/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_config_download_config_dir: tripleo_overcloud_config_download_config_type: tripleo_overcloud_config_download_debug: false tripleo_overcloud_config_download_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_config_download_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_config_download_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_config_download_log: "{{ tripleo_overcloud_config_download_home_dir }}/overcloud_config_download.log" tripleo_overcloud_config_download_log_combine: true diff --git a/roles/tripleo_overcloud_config_download/tasks/main.yml b/roles/tripleo_overcloud_config_download/tasks/main.yml index b179eec..7de5075 100644 --- a/roles/tripleo_overcloud_config_download/tasks/main.yml +++ b/roles/tripleo_overcloud_config_download/tasks/main.yml @@ -52,8 +52,9 @@ async: "{{ tripleo_overcloud_config_download_timeout }}" poll: "{{ tripleo_overcloud_config_download_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_config_download_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_container_image_build/README.md b/roles/tripleo_overcloud_container_image_build/README.md index 768c07f..30ef994 100644 --- a/roles/tripleo_overcloud_container_image_build/README.md +++ b/roles/tripleo_overcloud_container_image_build/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_container_image_build_config_files`: (List) YAML COnfig file(s) specifyign the image to build. Default: [] * `tripleo_overcloud_container_image_build_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_container_image_build_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_container_image_build_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_container_image_build_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_container_image_build_excludes`: (List) Name of containers to exclude from the build. Default: [] * `tripleo_overcloud_container_image_build_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_container_image_build_kolla_config_file`: (String) Path to Kolla config file. diff --git a/roles/tripleo_overcloud_container_image_build/defaults/main.yml b/roles/tripleo_overcloud_container_image_build/defaults/main.yml index 5fc1dc9..1cf6e9d 100644 --- a/roles/tripleo_overcloud_container_image_build/defaults/main.yml +++ b/roles/tripleo_overcloud_container_image_build/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_container_image_build_config_files: [] tripleo_overcloud_container_image_build_debug: false tripleo_overcloud_container_image_build_excludes: [] tripleo_overcloud_container_image_build_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_container_image_build_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_container_image_build_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_container_image_build_kolla_config_file: tripleo_overcloud_container_image_build_list_dependencies: false diff --git a/roles/tripleo_overcloud_container_image_build/tasks/main.yml b/roles/tripleo_overcloud_container_image_build/tasks/main.yml index 0ab4e64..24eaf00 100644 --- a/roles/tripleo_overcloud_container_image_build/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_build/tasks/main.yml @@ -49,7 +49,9 @@ async: "{{ tripleo_overcloud_container_image_build_timeout }}" poll: "{{ tripleo_overcloud_container_image_build_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_container_image_build_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_container_image_prepare/README.md b/roles/tripleo_overcloud_container_image_prepare/README.md index 5eefb92..57a0b05 100644 --- a/roles/tripleo_overcloud_container_image_prepare/README.md +++ b/roles/tripleo_overcloud_container_image_prepare/README.md @@ -19,6 +19,7 @@ Role Variables * `tripleo_overcloud_container_image_prepare_environment_files`: (List) List of environment files specifying which services are containerized. Default: [] * `tripleo_overcloud_container_image_prepare_excludes`: (List) List of patterns to match the imagename against to exclude from the output. Default: [] * `tripleo_overcloud_container_image_prepare_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_container_image_prepare_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_container_image_prepare_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_container_image_prepare_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_container_image_prepare_includes`: (List) List of patterns to match the imagename against to include in the output. Default: [] * `tripleo_overcloud_container_image_prepare_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true diff --git a/roles/tripleo_overcloud_container_image_prepare/defaults/main.yml b/roles/tripleo_overcloud_container_image_prepare/defaults/main.yml index a5784aa..8040319 100644 --- a/roles/tripleo_overcloud_container_image_prepare/defaults/main.yml +++ b/roles/tripleo_overcloud_container_image_prepare/defaults/main.yml @@ -6,6 +6,7 @@ tripleo_overcloud_container_image_prepare_environment_directory: tripleo_overcloud_container_image_prepare_environment_files: [] tripleo_overcloud_container_image_prepare_excludes: [] tripleo_overcloud_container_image_prepare_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_container_image_prepare_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_container_image_prepare_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_container_image_prepare_includes: [] tripleo_overcloud_container_image_prepare_log: "{{ tripleo_overcloud_container_image_prepare_home_dir }}/overcloud_container_image_prepare.log" diff --git a/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml b/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml index 957b661..55694eb 100644 --- a/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_prepare/tasks/main.yml @@ -73,8 +73,9 @@ async: "{{ tripleo_overcloud_container_image_prepare_timeout }}" poll: "{{ tripleo_overcloud_container_image_prepare_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_container_image_prepare_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_container_image_tag_discover/README.md b/roles/tripleo_overcloud_container_image_tag_discover/README.md index 926c538..bf14651 100644 --- a/roles/tripleo_overcloud_container_image_tag_discover/README.md +++ b/roles/tripleo_overcloud_container_image_tag_discover/README.md @@ -16,6 +16,7 @@ Role Variables * `tripleo_overcloud_container_image_tag_discover_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_container_image_tag_discover_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_container_image_tag_discover_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_container_image_tag_discover_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_container_image_tag_discover_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_container_image_tag_discover_image`: (String) REQUIRED. Fully qualified name of the image to discover the tag. * `tripleo_overcloud_container_image_tag_discover_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true diff --git a/roles/tripleo_overcloud_container_image_tag_discover/defaults/main.yml b/roles/tripleo_overcloud_container_image_tag_discover/defaults/main.yml index 51f974d..718892b 100644 --- a/roles/tripleo_overcloud_container_image_tag_discover/defaults/main.yml +++ b/roles/tripleo_overcloud_container_image_tag_discover/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_container_image_tag_discover_debug: false tripleo_overcloud_container_image_tag_discover_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_container_image_tag_discover_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_container_image_tag_discover_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_container_image_tag_discover_image: tripleo_overcloud_container_image_tag_discover_log: "{{ tripleo_overcloud_container_image_tag_discover_home_dir }}/overcloud_container_image_tag_discover.log" 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 9059eba..6503d45 100644 --- a/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_tag_discover/tasks/main.yml @@ -46,8 +46,9 @@ async: "{{ tripleo_overcloud_container_image_tag_discover_timeout }}" poll: "{{ tripleo_overcloud_container_image_tag_discover_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_container_image_tag_discover_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_container_image_upload/README.md b/roles/tripleo_overcloud_container_image_upload/README.md index 88fcb68..8b5bdaf 100644 --- a/roles/tripleo_overcloud_container_image_upload/README.md +++ b/roles/tripleo_overcloud_container_image_upload/README.md @@ -18,6 +18,7 @@ Role Variables * `tripleo_overcloud_container_image_upload_config_files`: (List) REQUIRED. YAML config files specifying images. Default: [] * `tripleo_overcloud_container_image_upload_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_container_image_upload_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_container_image_upload_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_container_image_upload_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_container_image_upload_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_container_image_upload_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_container_image_upload_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_container_image_upload/defaults/main.yml b/roles/tripleo_overcloud_container_image_upload/defaults/main.yml index 11e0c63..4fc5438 100644 --- a/roles/tripleo_overcloud_container_image_upload/defaults/main.yml +++ b/roles/tripleo_overcloud_container_image_upload/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_container_image_upload_cleanup: tripleo_overcloud_container_image_upload_config_files: [] tripleo_overcloud_container_image_upload_debug: false tripleo_overcloud_container_image_upload_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_container_image_upload_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_container_image_upload_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_container_image_upload_log: "{{ tripleo_overcloud_container_image_upload_home_dir }}/overcloud_container_image_upload.log" tripleo_overcloud_container_image_upload_log_combine: true diff --git a/roles/tripleo_overcloud_container_image_upload/tasks/main.yml b/roles/tripleo_overcloud_container_image_upload/tasks/main.yml index a14ece5..f06f775 100644 --- a/roles/tripleo_overcloud_container_image_upload/tasks/main.yml +++ b/roles/tripleo_overcloud_container_image_upload/tasks/main.yml @@ -45,8 +45,9 @@ async: "{{ tripleo_overcloud_container_image_upload_timeout }}" poll: "{{ tripleo_overcloud_container_image_upload_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_container_image_upload_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_credentials/README.md b/roles/tripleo_overcloud_credentials/README.md index df19d78..b6b2d0f 100644 --- a/roles/tripleo_overcloud_credentials/README.md +++ b/roles/tripleo_overcloud_credentials/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_credentials_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_credentials_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_credentials_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_credentials_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_credentials_directory`: (String) The directory to create the rc files in. Defaults to current working directory which will be `tripleo_overcloud_credentials_home_dir`. * `tripleo_overcloud_credentials_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_credentials_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true diff --git a/roles/tripleo_overcloud_credentials/defaults/main.yml b/roles/tripleo_overcloud_credentials/defaults/main.yml index 1efe4e8..3412db2 100644 --- a/roles/tripleo_overcloud_credentials/defaults/main.yml +++ b/roles/tripleo_overcloud_credentials/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_credentials_debug: false tripleo_overcloud_credentials_directory: tripleo_overcloud_credentials_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_credentials_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_credentials_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_credentials_log: "{{ tripleo_overcloud_credentials_home_dir }}/overcloud_credentials.log" tripleo_overcloud_credentials_log_combine: true diff --git a/roles/tripleo_overcloud_credentials/tasks/main.yml b/roles/tripleo_overcloud_credentials/tasks/main.yml index 9540608..3c02060 100644 --- a/roles/tripleo_overcloud_credentials/tasks/main.yml +++ b/roles/tripleo_overcloud_credentials/tasks/main.yml @@ -47,7 +47,9 @@ async: "{{ tripleo_overcloud_credentials_timeout }}" poll: "{{ tripleo_overcloud_credentials_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_credentials_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_delete/README.md b/roles/tripleo_overcloud_delete/README.md index be5b7cf..e8c8e6c 100644 --- a/roles/tripleo_overcloud_delete/README.md +++ b/roles/tripleo_overcloud_delete/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_delete_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_delete_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_delete_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_delete_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_delete_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_delete_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_delete_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_delete/defaults/main.yml b/roles/tripleo_overcloud_delete/defaults/main.yml index 594c1aa..ba150cd 100644 --- a/roles/tripleo_overcloud_delete/defaults/main.yml +++ b/roles/tripleo_overcloud_delete/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_delete_debug: false tripleo_overcloud_delete_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_delete_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_delete_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_delete_log: "{{ tripleo_overcloud_delete_home_dir }}/overcloud_delete.log" tripleo_overcloud_delete_log_combine: true diff --git a/roles/tripleo_overcloud_delete/tasks/main.yml b/roles/tripleo_overcloud_delete/tasks/main.yml index e5fbcba..d0456e3 100644 --- a/roles/tripleo_overcloud_delete/tasks/main.yml +++ b/roles/tripleo_overcloud_delete/tasks/main.yml @@ -47,8 +47,9 @@ async: "{{ tripleo_overcloud_delete_timeout }}" poll: "{{ tripleo_overcloud_delete_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_delete_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_deploy/README.md b/roles/tripleo_overcloud_deploy/README.md index 1018741..0c9e58c 100644 --- a/roles/tripleo_overcloud_deploy/README.md +++ b/roles/tripleo_overcloud_deploy/README.md @@ -25,6 +25,7 @@ Role Variables * `tripleo_overcloud_deploy_environment_files`: (List) A list of environment file paths for the deployment. Should not be used with environment dirs. * `tripleo_overcloud_deploy_force_postconfig`: (Boolean) Force the overclodu post-deployment configuration. Default: false * `tripleo_overcloud_deploy_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By defaukt uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` isn't defined. +* `tripleo_overcloud_deploy_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_deploy_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_deploy_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_deploy_inflight_validations`: (Boolean) Flag to enable inflight validations. Default: false * `tripleo_overcloud_deploy_libvirt_type`: (String) Libvirt domain time. Setting `NovaComputeLibvirtType` in an environment file is prefered over this option. diff --git a/roles/tripleo_overcloud_deploy/defaults/main.yml b/roles/tripleo_overcloud_deploy/defaults/main.yml index 881e256..079df6b 100644 --- a/roles/tripleo_overcloud_deploy/defaults/main.yml +++ b/roles/tripleo_overcloud_deploy/defaults/main.yml @@ -15,6 +15,7 @@ tripleo_overcloud_deploy_environment_dirs: [] tripleo_overcloud_deploy_environment_files: [] tripleo_overcloud_deploy_force_postconfig: false tripleo_overcloud_deploy_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_deploy_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_deploy_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_deploy_inflight_validations: false tripleo_overcloud_deploy_libvirt_type: diff --git a/roles/tripleo_overcloud_deploy/tasks/main.yml b/roles/tripleo_overcloud_deploy/tasks/main.yml index d26f4f9..b5ac1b9 100644 --- a/roles/tripleo_overcloud_deploy/tasks/main.yml +++ b/roles/tripleo_overcloud_deploy/tasks/main.yml @@ -100,7 +100,9 @@ async: "{{ tripleo_overcloud_deploy_timeout }}" poll: "{{ tripleo_overcloud_deploy_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_deploy_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_export/README.md b/roles/tripleo_overcloud_export/README.md index beed69d..1fa7098 100644 --- a/roles/tripleo_overcloud_export/README.md +++ b/roles/tripleo_overcloud_export/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_overcloud_export_debug`: (Boolean) Flag to print out the command that is run. Default: False * `tripleo_overcloud_export_force_overwrite`: (Boolean) Overwrite the output file if it exists. Default: false * `tripleo_overcloud_export_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_export_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_export_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_export_home_dir`: (String) Location to runt he command in. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_export_no_password_excludes`: (Boolean) Do not exclude certain passwords from the export. Default: false * `tripleo_overcloud_export_os_cloud`: (String) (String) OS_CLOUD value to use when running the command. If `tripleo_os_cloud` is defined, it will be the default. Otherwise the default is ''. This variable takes precedence over `tripleo_overcloud_export_rc_file`. diff --git a/roles/tripleo_overcloud_export/defaults/main.yml b/roles/tripleo_overcloud_export/defaults/main.yml index 89bffef..db380f0 100644 --- a/roles/tripleo_overcloud_export/defaults/main.yml +++ b/roles/tripleo_overcloud_export/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_export_config_download_dir: tripleo_overcloud_export_debug: false tripleo_overcloud_export_force_overwrite: false tripleo_overcloud_export_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_export_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_export_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_export_no_password_excludes: false tripleo_overcloud_export_os_cloud: "{{ tripleo_os_cloud | default('') }}" diff --git a/roles/tripleo_overcloud_export/tasks/main.yml b/roles/tripleo_overcloud_export/tasks/main.yml index 7873107..9b90e94 100644 --- a/roles/tripleo_overcloud_export/tasks/main.yml +++ b/roles/tripleo_overcloud_export/tasks/main.yml @@ -40,6 +40,9 @@ warn: false register: tripleo_overcloud_export_result changed_when: false + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_export_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_external_update_run/README.md b/roles/tripleo_overcloud_external_update_run/README.md index e445f8b..732c8c0 100644 --- a/roles/tripleo_overcloud_external_update_run/README.md +++ b/roles/tripleo_overcloud_external_update_run/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_external_update_run_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_external_update_run_extra_vars`: (List) List of key=value or yaml/json file ansible refernce. Default: [] * `tripleo_overcloud_external_update_run_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_external_update_run_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_external_update_run_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_external_update_run_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_external_update_run_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_external_update_run_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_external_update_run/defaults/main.yml b/roles/tripleo_overcloud_external_update_run/defaults/main.yml index 50233f8..1eca3c9 100644 --- a/roles/tripleo_overcloud_external_update_run/defaults/main.yml +++ b/roles/tripleo_overcloud_external_update_run/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_external_update_run_debug: false tripleo_overcloud_external_update_run_extra_vars: [] tripleo_overcloud_external_update_run_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_external_update_run_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_external_update_run_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_external_update_run_log: "{{ tripleo_overcloud_external_update_run_home_dir }}/overcloud_external_update_run.log" tripleo_overcloud_external_update_run_log_combine: true diff --git a/roles/tripleo_overcloud_external_update_run/tasks/main.yml b/roles/tripleo_overcloud_external_update_run/tasks/main.yml index 7459fe0..0f23f2e 100644 --- a/roles/tripleo_overcloud_external_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_external_update_run/tasks/main.yml @@ -54,7 +54,9 @@ async: "{{ tripleo_overcloud_external_update_run_timeout }}" poll: "{{ tripleo_overcloud_external_update_run_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_external_update_run_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_external_upgrade_run/README.md b/roles/tripleo_overcloud_external_upgrade_run/README.md index 350bb5c..b747993 100644 --- a/roles/tripleo_overcloud_external_upgrade_run/README.md +++ b/roles/tripleo_overcloud_external_upgrade_run/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_external_upgrade_run_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_external_upgrade_run_extra_vars`: (List) List of key=value or yaml/json file ansible refernce. Default: [] * `tripleo_overcloud_external_upgrade_run_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_external_upgrade_run_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_external_upgrade_run_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_external_upgrade_run_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_external_upgrade_run_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_external_upgrade_run_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_external_upgrade_run/defaults/main.yml b/roles/tripleo_overcloud_external_upgrade_run/defaults/main.yml index f9413fa..9509946 100644 --- a/roles/tripleo_overcloud_external_upgrade_run/defaults/main.yml +++ b/roles/tripleo_overcloud_external_upgrade_run/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_external_upgrade_run_debug: false tripleo_overcloud_external_upgrade_run_extra_vars: [] tripleo_overcloud_external_upgrade_run_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_external_upgrade_run_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_external_upgrade_run_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_external_upgrade_run_log: "{{ tripleo_overcloud_external_upgrade_run_home_dir }}/overcloud_external_upgrade_run.log" tripleo_overcloud_external_upgrade_run_log_combine: true diff --git a/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml index 481e5f5..a8e5f53 100644 --- a/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_external_upgrade_run/tasks/main.yml @@ -54,7 +54,9 @@ async: "{{ tripleo_overcloud_external_upgrade_run_timeout }}" poll: "{{ tripleo_overcloud_external_upgrade_run_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_external_upgrade_run_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_ffwd_upgrade_converge/README.md b/roles/tripleo_overcloud_ffwd_upgrade_converge/README.md index 22f2705..377e7c2 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_converge/README.md +++ b/roles/tripleo_overcloud_ffwd_upgrade_converge/README.md @@ -12,6 +12,7 @@ Role Variables -------------- * `tripleo_overcloud_ffwd_upgrade_converge_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_ffwd_upgrade_converge_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_ffwd_upgrade_converge_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_upgrade_ffwd_converge_answers_file`: (String) File path to a deployment answers file. * `tripleo_overcloud_upgrade_ffwd_converge_baremetal_deployment`: (String) File path to a baremetal deployment configuration. * `tripleo_overcloud_upgrade_ffwd_converge_config_download_timeout`: (Integer) Timeout in minutes for the config-download steps. diff --git a/roles/tripleo_overcloud_ffwd_upgrade_converge/defaults/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_converge/defaults/main.yml index e01098d..7337c98 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_converge/defaults/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_converge/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_overcloud_ffwd_upgrade_converge_environment_dirs: [] tripleo_overcloud_ffwd_upgrade_converge_environment_files: [] tripleo_overcloud_ffwd_upgrade_converge_force_postconfig: false tripleo_overcloud_ffwd_upgrade_converge_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_ffwd_upgrade_converge_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_ffwd_upgrade_converge_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_ffwd_upgrade_converge_inflight_validations: false tripleo_overcloud_ffwd_upgrade_converge_libvirt_type: diff --git a/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml index 805f70a..219ac21 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_converge/tasks/main.yml @@ -99,7 +99,9 @@ async: "{{ tripleo_overcloud_ffwd_upgrade_converge_timeout }}" poll: "{{ tripleo_overcloud_ffwd_upgrade_converge_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_ffwd_upgrade_converge_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_ffwd_upgrade_prepare/README.md b/roles/tripleo_overcloud_ffwd_upgrade_prepare/README.md index 003bfe1..88e570a 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_prepare/README.md +++ b/roles/tripleo_overcloud_ffwd_upgrade_prepare/README.md @@ -17,6 +17,7 @@ Role Variables * `tripleo_overcloud_ffwd_upgrade_prepare_config_download_timeout`: (Integer) Timeout in minutes for the config-download steps. * `tripleo_overcloud_ffwd_upgrade_prepare_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_ffwd_upgrade_prepare_deployed_server`: (Boolean) Flag to use pre-provisioned nodes. Default: false * `tripleo_overcloud_ffwd_upgrade_prepare_disable_password_generation`: (Boolean) Flag to disable password generation. Default: false * `tripleo_overcloud_ffwd_upgrade_prepare_disable_validations`: (Boolean) Flag to disable validations. Default: false diff --git a/roles/tripleo_overcloud_ffwd_upgrade_prepare/defaults/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_prepare/defaults/main.yml index 4d69323..e33a8aa 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_prepare/defaults/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_prepare/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_overcloud_ffwd_upgrade_prepare_environment_dirs: [] tripleo_overcloud_ffwd_upgrade_prepare_environment_files: [] tripleo_overcloud_ffwd_upgrade_prepare_force_postconfig: false tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_ffwd_upgrade_prepare_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_ffwd_upgrade_prepare_inflight_validations: false tripleo_overcloud_ffwd_upgrade_prepare_libvirt_type: diff --git a/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml index 7e44cf0..fec64ca 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_prepare/tasks/main.yml @@ -99,7 +99,9 @@ async: "{{ tripleo_overcloud_ffwd_upgrade_prepare_timeout }}" poll: "{{ tripleo_overcloud_ffwd_upgrade_prepare_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_ffwd_upgrade_prepare_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_ffwd_upgrade_run/README.md b/roles/tripleo_overcloud_ffwd_upgrade_run/README.md index 53ed1af..dceb6e1 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_run/README.md +++ b/roles/tripleo_overcloud_ffwd_upgrade_run/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_ffwd_upgrade_run_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_ffwd_upgrade_run_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_ffwd_upgrade_run_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_ffwd_upgrade_run_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_ffwd_upgrade_run_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_ffwd_upgrade_run_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_ffwd_upgrade_run_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_ffwd_upgrade_run/defaults/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_run/defaults/main.yml index 213b719..d67c738 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_run/defaults/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_run/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_ffwd_upgrade_run_debug: false tripleo_overcloud_ffwd_upgrade_run_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_ffwd_upgrade_run_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_ffwd_upgrade_run_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_ffwd_upgrade_run_log: "{{ tripleo_overcloud_ffwd_upgrade_run_home_dir }}/overcloud_ffwd_upgrade_run.log" tripleo_overcloud_ffwd_upgrade_run_log_combine: true diff --git a/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml index fc45764..bcab6d4 100644 --- a/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_ffwd_upgrade_run/tasks/main.yml @@ -50,7 +50,9 @@ async: "{{ tripleo_overcloud_ffwd_upgrade_run_timeout }}" poll: "{{ tripleo_overcloud_ffwd_upgrade_run_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_ffwd_upgrade_run_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_generate_fencing/README.md b/roles/tripleo_overcloud_generate_fencing/README.md index e6c36d3..423b36a 100644 --- a/roles/tripleo_overcloud_generate_fencing/README.md +++ b/roles/tripleo_overcloud_generate_fencing/README.md @@ -16,6 +16,7 @@ Role Variables * `tripleo_overcloud_generate_fencing_delay`: (Integer) Number of seconds to wait before fencing is started. * `tripleo_overcloud_generate_fencing_environment_file`: (String) REQUIRED. Path to the environment file. * `tripleo_overcloud_generate_fencing_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_generate_fencing_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_generate_fencing_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_generate_fencing_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_generate_fencing_ipmi_cipher`: (String) Cipher squit to use (same as ipmitool -C) * `tripleo_overcloud_generate_fencing_ipmi_lanplus`: (Boolean) Use lanplus. Option deprecated because it's the default. Default: false diff --git a/roles/tripleo_overcloud_generate_fencing/defaults/main.yml b/roles/tripleo_overcloud_generate_fencing/defaults/main.yml index cb7443e..a76074f 100644 --- a/roles/tripleo_overcloud_generate_fencing/defaults/main.yml +++ b/roles/tripleo_overcloud_generate_fencing/defaults/main.yml @@ -6,6 +6,7 @@ tripleo_overcloud_generate_fencing_debug: false tripleo_overcloud_generate_fencing_delay: tripleo_overcloud_generate_fencing_environment_file: tripleo_overcloud_generate_fencing_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_generate_fencing_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_generate_fencing_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_generate_fencing_ipmi_cipher: tripleo_overcloud_generate_fencing_ipmi_lanplus: false diff --git a/roles/tripleo_overcloud_generate_fencing/tasks/main.yml b/roles/tripleo_overcloud_generate_fencing/tasks/main.yml index 85e6e0e..8212b46 100644 --- a/roles/tripleo_overcloud_generate_fencing/tasks/main.yml +++ b/roles/tripleo_overcloud_generate_fencing/tasks/main.yml @@ -57,7 +57,9 @@ async: "{{ tripleo_overcloud_generate_fencing_timeout }}" poll: "{{ tripleo_overcloud_generate_fencing_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_generate_fencing_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_image_build/README.md b/roles/tripleo_overcloud_image_build/README.md index c70772e..ad60770 100644 --- a/roles/tripleo_overcloud_image_build/README.md +++ b/roles/tripleo_overcloud_image_build/README.md @@ -17,6 +17,7 @@ Role Variables * `tripleo_overcloud_image_build_dib_yum_repo_conf`: (String) String containing the path to the yum files for the image building process. Default: "/etc/yum.repos.d/*" * `tripleo_overcloud_image_build_extra_env_vars`: (Dictionary) Dictionary containing extra environment variables to be set for the build. Default: {} * `tripleo_overcloud_image_build_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_image_build_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_image_build_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_image_build_home_dir`: (String) Path that the command should be executed in. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_image_build_image_names`: (List) List of image names to build. * `tripleo_overcloud_image_build_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true diff --git a/roles/tripleo_overcloud_image_build/defaults/main.yml b/roles/tripleo_overcloud_image_build/defaults/main.yml index a5a9ea7..9748ed8 100644 --- a/roles/tripleo_overcloud_image_build/defaults/main.yml +++ b/roles/tripleo_overcloud_image_build/defaults/main.yml @@ -7,6 +7,7 @@ tripleo_overcloud_image_build_dib_local_image: tripleo_overcloud_image_build_dib_yum_repo_conf: "/etc/yum.repos.d/*" tripleo_overcloud_image_build_extra_env_vars: {} tripleo_overcloud_image_build_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_image_build_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_image_build_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_image_build_image_names: [] tripleo_overcloud_image_build_log: "{{ tripleo_overcloud_image_build_home_dir }}/overcloud_image_build.log" diff --git a/roles/tripleo_overcloud_image_build/tasks/main.yml b/roles/tripleo_overcloud_image_build/tasks/main.yml index 07e39a4..2361dd7 100644 --- a/roles/tripleo_overcloud_image_build/tasks/main.yml +++ b/roles/tripleo_overcloud_image_build/tasks/main.yml @@ -56,3 +56,6 @@ poll: "{{ tripleo_overcloud_image_build_poll }}" register: tripleo_overcloud_image_build_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_image_build_generate_scripts_only|bool diff --git a/roles/tripleo_overcloud_image_upload/README.md b/roles/tripleo_overcloud_image_upload/README.md index 98d4ff2..99ea076 100644 --- a/roles/tripleo_overcloud_image_upload/README.md +++ b/roles/tripleo_overcloud_image_upload/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_image_upload_architecture`: (String) Architecture type for the images being uploaded. * `tripleo_overcloud_image_upload_debug`: (Boolean) Flag to print out the command that is run. Default: False * `tripleo_overcloud_image_upload_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_image_upload_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_image_upload_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_image_upload_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_image_upload_http_boot`: (String) Root directory for the ironic-pytho-agent-image * `tripleo_overcloud_image_upload_image_path`: (String) Path to directory overcloud images. By default the command will use the images in `tripleo_overcloud_image_upload_home_dir` if this is not specified. diff --git a/roles/tripleo_overcloud_image_upload/defaults/main.yml b/roles/tripleo_overcloud_image_upload/defaults/main.yml index 494390d..52fd5bc 100644 --- a/roles/tripleo_overcloud_image_upload/defaults/main.yml +++ b/roles/tripleo_overcloud_image_upload/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_image_upload_architecture: tripleo_overcloud_image_upload_debug: false tripleo_overcloud_image_upload_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_image_upload_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_image_upload_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_image_upload_http_boot: tripleo_overcloud_image_upload_image_path: diff --git a/roles/tripleo_overcloud_image_upload/tasks/main.yml b/roles/tripleo_overcloud_image_upload/tasks/main.yml index c3627bc..dec1cd3 100644 --- a/roles/tripleo_overcloud_image_upload/tasks/main.yml +++ b/roles/tripleo_overcloud_image_upload/tasks/main.yml @@ -63,6 +63,9 @@ register: tripleo_overcloud_image_upload_result poll: "{{ tripleo_overcloud_image_upload_poll }}" changed_when: false + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_image_upload_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_netenv_validate/README.md b/roles/tripleo_overcloud_netenv_validate/README.md index 724f64a..d3b41c4 100644 --- a/roles/tripleo_overcloud_netenv_validate/README.md +++ b/roles/tripleo_overcloud_netenv_validate/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_netenv_validate_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_netenv_validate_file`: (String) REQUIRED. Path to the network environment file * `tripleo_overcloud_netenv_validate_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_netenv_validate_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_netenv_validate_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_netenv_validate_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_netenv_validate_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_netenv_validate_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_netenv_validate/defaults/main.yml b/roles/tripleo_overcloud_netenv_validate/defaults/main.yml index 06559df..a245824 100644 --- a/roles/tripleo_overcloud_netenv_validate/defaults/main.yml +++ b/roles/tripleo_overcloud_netenv_validate/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_netenv_validate_debug: false tripleo_overcloud_netenv_validate_file: tripleo_overcloud_netenv_validate_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_netenv_validate_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_netenv_validate_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_netenv_validate_log: "{{ tripleo_overcloud_netenv_validate_home_dir }}/overcloud_netenv_validate.log" tripleo_overcloud_netenv_validate_log_combine: true diff --git a/roles/tripleo_overcloud_netenv_validate/tasks/main.yml b/roles/tripleo_overcloud_netenv_validate/tasks/main.yml index c2808cb..06e9f39 100644 --- a/roles/tripleo_overcloud_netenv_validate/tasks/main.yml +++ b/roles/tripleo_overcloud_netenv_validate/tasks/main.yml @@ -44,8 +44,9 @@ async: "{{ tripleo_overcloud_netenv_validate_timeout }}" poll: "{{ tripleo_overcloud_netenv_validate_poll }}" changed_when: false - when: not ansible_check_mode|bool - + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_netenv_validate_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_node_bios_configure/defaults/main.yml b/roles/tripleo_overcloud_node_bios_configure/defaults/main.yml index 4517ee5..95ebc1e 100644 --- a/roles/tripleo_overcloud_node_bios_configure/defaults/main.yml +++ b/roles/tripleo_overcloud_node_bios_configure/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_node_bios_configure_all_manageable: false tripleo_overcloud_node_bios_configure_configuration: tripleo_overcloud_node_bios_configure_debug: false tripleo_overcloud_node_bios_configure_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_node_bios_configure_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_node_bios_configure_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_node_bios_configure_node_uuids: [] tripleo_overcloud_node_bios_configure_os_cloud: "{{ tripleo_os_cloud | default('') }}" diff --git a/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml b/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml index 0726b25..d0b5aff 100644 --- a/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml +++ b/roles/tripleo_overcloud_node_bios_configure/tasks/main.yml @@ -39,6 +39,9 @@ warn: false register: tripleo_overcloud_node_bios_configure_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_node_bios_configure_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_node_delete/README.md b/roles/tripleo_overcloud_node_delete/README.md index 27ecef7..e680eeb 100644 --- a/roles/tripleo_overcloud_node_delete/README.md +++ b/roles/tripleo_overcloud_node_delete/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_node_delete_nodes`: Node ID(s) to delete (otherwise specified in the --baremetal-deployment file) * `tripleo_overcloud_node_delete_baremetal_deployment`: Configuration file describing the baremetal deployment * `tripleo_overcloud_node_delete_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_node_delete_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_node_delete_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_node_delete_home_dir`: (String) Location to run the command in. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_node_delete_stack`: Name or ID of heat stack to scale (default=Env: OVERCLOUD_STACK_NAME) * `tripleo_overcloud_node_delete_templates`: The directory containing the Heat templates to deploy. diff --git a/roles/tripleo_overcloud_node_delete/defaults/main.yml b/roles/tripleo_overcloud_node_delete/defaults/main.yml index 0ea5145..0de05c2 100644 --- a/roles/tripleo_overcloud_node_delete/defaults/main.yml +++ b/roles/tripleo_overcloud_node_delete/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_node_delete_baremetal_deployment: tripleo_overcloud_node_delete_debug: false tripleo_overcloud_node_delete_environment_file: tripleo_overcloud_node_delete_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_node_delete_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_node_delete_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_node_delete_nodes: [] tripleo_overcloud_node_delete_os_cloud: "{{ tripleo_os_cloud | default('') }}" diff --git a/roles/tripleo_overcloud_node_delete/tasks/main.yml b/roles/tripleo_overcloud_node_delete/tasks/main.yml index 5fdb54a..38f2a8d 100644 --- a/roles/tripleo_overcloud_node_delete/tasks/main.yml +++ b/roles/tripleo_overcloud_node_delete/tasks/main.yml @@ -43,6 +43,9 @@ warn: false register: tripleo_overcloud_node_delete_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_node_delete_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_node_discover/defaults/main.yml b/roles/tripleo_overcloud_node_discover/defaults/main.yml index 590bc7a..021cecd 100644 --- a/roles/tripleo_overcloud_node_discover/defaults/main.yml +++ b/roles/tripleo_overcloud_node_discover/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_node_discover_concurrency: tripleo_overcloud_node_discover_credentials: tripleo_overcloud_node_discover_debug: false tripleo_overcloud_node_discover_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_node_discover_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_node_discover_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_node_discover_instance_boot_option: tripleo_overcloud_node_discover_introspect: false diff --git a/roles/tripleo_overcloud_node_discover/tasks/main.yml b/roles/tripleo_overcloud_node_discover/tasks/main.yml index 39e43a6..00d6899 100644 --- a/roles/tripleo_overcloud_node_discover/tasks/main.yml +++ b/roles/tripleo_overcloud_node_discover/tasks/main.yml @@ -47,6 +47,9 @@ warn: false register: tripleo_overcloud_node_discover_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_node_discover_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_node_import/README.md b/roles/tripleo_overcloud_node_import/README.md index 697ff22..3dbc7ae 100644 --- a/roles/tripleo_overcloud_node_import/README.md +++ b/roles/tripleo_overcloud_node_import/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_overcloud_node_import_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_node_import_environment_file`: (String) Path to the file that contains the baremetal node information. Can be a JSON, YAML or CSV file. Default: environment.json * `tripleo_overcloud_node_import_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_node_import_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_node_import_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_node_import_home_dir`: (String) Path to the directory to execute the command in. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_node_import_http_boot`: (String) Root directory for the ironic-python-agent image. * `tripleo_overcloud_node_import_instance_boot_option`: (String) Wheither to set instances for booting from local hard drive (local) or network (netboot). diff --git a/roles/tripleo_overcloud_node_import/defaults/main.yml b/roles/tripleo_overcloud_node_import/defaults/main.yml index de99ed1..71b9e0f 100644 --- a/roles/tripleo_overcloud_node_import/defaults/main.yml +++ b/roles/tripleo_overcloud_node_import/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_overcloud_node_import_concurrency: tripleo_overcloud_node_import_debug: false tripleo_overcloud_node_import_environment_file: environment.json tripleo_overcloud_node_import_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_node_import_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_node_import_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_node_import_http_boot: tripleo_overcloud_node_import_instance_boot_option: diff --git a/roles/tripleo_overcloud_node_import/tasks/main.yml b/roles/tripleo_overcloud_node_import/tasks/main.yml index 34cfa3a..8464861 100644 --- a/roles/tripleo_overcloud_node_import/tasks/main.yml +++ b/roles/tripleo_overcloud_node_import/tasks/main.yml @@ -48,6 +48,7 @@ poll: "{{ tripleo_overcloud_node_import_poll }}" register: tripleo_overcloud_node_import_result changed_when: true + when: not tripleo_overcloud_node_import_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_node_provision/README.md b/roles/tripleo_overcloud_node_provision/README.md index 65ef8cf..b8908fb 100644 --- a/roles/tripleo_overcloud_node_provision/README.md +++ b/roles/tripleo_overcloud_node_provision/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_overcloud_node_provision_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_node_provision_deployment_file`: (String) REQUIRED. File path to the deployment file describing the nodes. * `tripleo_overcloud_node_provision_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_node_provision_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_node_provision_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_node_provision_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_node_provision_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_node_provision_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_profiles_list/README.md b/roles/tripleo_overcloud_profiles_list/README.md index 7a34281..9cc4076 100644 --- a/roles/tripleo_overcloud_profiles_list/README.md +++ b/roles/tripleo_overcloud_profiles_list/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_profiles_list_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_profiles_list_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_profiles_list_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_profiles_list_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_profiles_list_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_profiles_list_all`: List all nodes, even those not available to Nova. * `tripleo_overcloud_profiles_list_control_flavor`: (Deprecated in U) Nova flavor to use for control nodes. diff --git a/roles/tripleo_overcloud_profiles_list/defaults/main.yml b/roles/tripleo_overcloud_profiles_list/defaults/main.yml index 160415c..0316d94 100644 --- a/roles/tripleo_overcloud_profiles_list/defaults/main.yml +++ b/roles/tripleo_overcloud_profiles_list/defaults/main.yml @@ -8,6 +8,7 @@ tripleo_overcloud_profiles_list_compute_flavor: tripleo_overcloud_profiles_list_control_flavor: tripleo_overcloud_profiles_list_debug: false tripleo_overcloud_profiles_list_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_profiles_list_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_profiles_list_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_profiles_list_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_overcloud_profiles_list_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" diff --git a/roles/tripleo_overcloud_profiles_list/tasks/main.yml b/roles/tripleo_overcloud_profiles_list/tasks/main.yml index 765897d..a702070 100644 --- a/roles/tripleo_overcloud_profiles_list/tasks/main.yml +++ b/roles/tripleo_overcloud_profiles_list/tasks/main.yml @@ -37,6 +37,9 @@ environment: "{{ _list_env }}" register: tripleo_overcloud_profiles_list_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_profiles_list_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_profiles_match/README.md b/roles/tripleo_overcloud_profiles_match/README.md index ebdae31..2e1f5d7 100644 --- a/roles/tripleo_overcloud_profiles_match/README.md +++ b/roles/tripleo_overcloud_profiles_match/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_profiles_match_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_profiles_match_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_profiles_match_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_profiles_match_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_profiles_match_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_profiles_match_all`: List all nodes, even those not available to Nova. * `tripleo_overcloud_profiles_list_control_flavor`: (Deprecated in U) Nova flavor to use for control nodes. diff --git a/roles/tripleo_overcloud_profiles_match/defaults/main.yml b/roles/tripleo_overcloud_profiles_match/defaults/main.yml index 7507784..0c84562 100644 --- a/roles/tripleo_overcloud_profiles_match/defaults/main.yml +++ b/roles/tripleo_overcloud_profiles_match/defaults/main.yml @@ -12,6 +12,7 @@ tripleo_overcloud_profiles_match_control_flavor: tripleo_overcloud_profiles_match_control_scale: tripleo_overcloud_profiles_match_debug: false tripleo_overcloud_profiles_match_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_profiles_match_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_profiles_match_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_profiles_match_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_overcloud_profiles_match_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" diff --git a/roles/tripleo_overcloud_profiles_match/tasks/main.yml b/roles/tripleo_overcloud_profiles_match/tasks/main.yml index e5cbaca..cce04a4 100644 --- a/roles/tripleo_overcloud_profiles_match/tasks/main.yml +++ b/roles/tripleo_overcloud_profiles_match/tasks/main.yml @@ -53,6 +53,9 @@ environment: "{{ _match_env }}" register: tripleo_overcloud_profiles_match_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_profiles_match_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_raid_create/README.md b/roles/tripleo_overcloud_raid_create/README.md index 7bbfae1..6def625 100644 --- a/roles/tripleo_overcloud_raid_create/README.md +++ b/roles/tripleo_overcloud_raid_create/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_overcloud_raid_create_configuration`: (String) REQUIRED. Path to file containing raid configuration. * `tripleo_overcloud_raid_create_debug`: (Boolean) Flag to print out the delete command. Default: False * `tripleo_overcloud_raid_create_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_raid_create_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_raid_create_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_raid_create_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_raid_create_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true * `tripleo_overcloud_raid_create_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true diff --git a/roles/tripleo_overcloud_raid_create/defaults/main.yml b/roles/tripleo_overcloud_raid_create/defaults/main.yml index bad8450..31272bd 100644 --- a/roles/tripleo_overcloud_raid_create/defaults/main.yml +++ b/roles/tripleo_overcloud_raid_create/defaults/main.yml @@ -4,6 +4,7 @@ openstack_bin: openstack tripleo_overcloud_raid_create_configuration: tripleo_overcloud_raid_create_debug: false tripleo_overcloud_raid_create_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_raid_create_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_raid_create_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_raid_create_log: "{{ tripleo_overcloud_raid_create_home_dir }}/CHANGEME.log" tripleo_overcloud_raid_create_log_combine: true diff --git a/roles/tripleo_overcloud_raid_create/tasks/main.yml b/roles/tripleo_overcloud_raid_create/tasks/main.yml index 8770d16..5267f48 100644 --- a/roles/tripleo_overcloud_raid_create/tasks/main.yml +++ b/roles/tripleo_overcloud_raid_create/tasks/main.yml @@ -46,7 +46,9 @@ async: "{{ tripleo_overcloud_raid_create_timeout }}" poll: "{{ tripleo_overcloud_raid_create_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_raid_create_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_roles_generate/README.md b/roles/tripleo_overcloud_roles_generate/README.md index d0ee99c..3fe12f6 100644 --- a/roles/tripleo_overcloud_roles_generate/README.md +++ b/roles/tripleo_overcloud_roles_generate/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_overcloud_roles_generate_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_roles_generate_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_roles_generate_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_roles_generate_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_roles_generate_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_roles_generate_roles_path`: Filesystem path containing the role yaml files. By default this is in tripleo-heat-templates/roles. * `tripleo_overcloud_roles_generate_output_file`: File to capture all output to. For example, roles_data.yaml diff --git a/roles/tripleo_overcloud_roles_generate/defaults/main.yml b/roles/tripleo_overcloud_roles_generate/defaults/main.yml index c2b2c29..8111977 100644 --- a/roles/tripleo_overcloud_roles_generate/defaults/main.yml +++ b/roles/tripleo_overcloud_roles_generate/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_roles_generate_debug: false tripleo_overcloud_roles_generate_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_roles_generate_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_roles_generate_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_roles_generate_roles_path: /usr/share/openstack-tripleo-heat-templates/roles tripleo_overcloud_roles_generate_output_file: "{{ tripleo_overcloud_roles_generate_home_dir }}/roles_data.yaml" diff --git a/roles/tripleo_overcloud_roles_generate/tasks/main.yml b/roles/tripleo_overcloud_roles_generate/tasks/main.yml index 2e4b66c..007bc5b 100644 --- a/roles/tripleo_overcloud_roles_generate/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_generate/tasks/main.yml @@ -35,6 +35,9 @@ environment: "{{ _generate_roles_env }}" register: tripleo_overcloud_roles_generate_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_roles_generate_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_roles_list/README.md b/roles/tripleo_overcloud_roles_list/README.md index 5ecea0f..1164644 100644 --- a/roles/tripleo_overcloud_roles_list/README.md +++ b/roles/tripleo_overcloud_roles_list/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_roles_list_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_roles_list_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_roles_list_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_roles_list_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_roles_list_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_roles_list_name`: The name of the plan, which is used for the object storage container, workflow environment and orchestration stack names. * `tripleo_overcloud_roles_list_detail`: Include details about each role. diff --git a/roles/tripleo_overcloud_roles_list/defaults/main.yml b/roles/tripleo_overcloud_roles_list/defaults/main.yml index f8ab7c3..31f8c03 100644 --- a/roles/tripleo_overcloud_roles_list/defaults/main.yml +++ b/roles/tripleo_overcloud_roles_list/defaults/main.yml @@ -2,6 +2,7 @@ # defaults file for tripleo_overcloud_roles_list openstack_bin: openstack tripleo_overcloud_roles_list_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_roles_list_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_roles_list_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_roles_list_debug: false tripleo_overcloud_roles_list_name: diff --git a/roles/tripleo_overcloud_roles_list/tasks/main.yml b/roles/tripleo_overcloud_roles_list/tasks/main.yml index 3dfc7b7..530b4cd 100644 --- a/roles/tripleo_overcloud_roles_list/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_list/tasks/main.yml @@ -34,6 +34,9 @@ environment: "{{ _list_env }}" register: tripleo_overcloud_roles_list_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_roles_list_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_roles_show/README.md b/roles/tripleo_overcloud_roles_show/README.md index b3d6dc3..bf41c51 100644 --- a/roles/tripleo_overcloud_roles_show/README.md +++ b/roles/tripleo_overcloud_roles_show/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_roles_show_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_roles_show_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_roles_show_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_roles_show_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_roles_show_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_roles_show_role`: Role to display more information about. * `tripleo_overcloud_roles_show_name`: The name of the plan, which is used for the object storage container, diff --git a/roles/tripleo_overcloud_roles_show/defaults/main.yml b/roles/tripleo_overcloud_roles_show/defaults/main.yml index 67af991..dbb1262 100644 --- a/roles/tripleo_overcloud_roles_show/defaults/main.yml +++ b/roles/tripleo_overcloud_roles_show/defaults/main.yml @@ -2,6 +2,7 @@ # defaults file for tripleo_overcloud_roles_show openstack_bin: openstack tripleo_overcloud_roles_show_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_roles_show_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_roles_show_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_roles_show_debug: false tripleo_overcloud_roles_show_role: diff --git a/roles/tripleo_overcloud_roles_show/tasks/main.yml b/roles/tripleo_overcloud_roles_show/tasks/main.yml index 52dd115..715a811 100644 --- a/roles/tripleo_overcloud_roles_show/tasks/main.yml +++ b/roles/tripleo_overcloud_roles_show/tasks/main.yml @@ -33,6 +33,9 @@ environment: "{{ _show_env }}" register: tripleo_overcloud_roles_show_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_roles_show_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_support_report_collect/README.md b/roles/tripleo_overcloud_support_report_collect/README.md index a026e70..1d0528b 100644 --- a/roles/tripleo_overcloud_support_report_collect/README.md +++ b/roles/tripleo_overcloud_support_report_collect/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_support_report_collect_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_overcloud_support_report_collect_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_support_report_collect_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_support_report_collect_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_support_report_collect_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_support_report_collect_server_name`: Server name, group name, or partial name to match. For example "Controller" will match all controllers for an environment. * `tripleo_overcloud_support_report_collect_output_dir`: Output directory for the report. diff --git a/roles/tripleo_overcloud_support_report_collect/defaults/main.yml b/roles/tripleo_overcloud_support_report_collect/defaults/main.yml index 1c077f1..df8a4fe 100644 --- a/roles/tripleo_overcloud_support_report_collect/defaults/main.yml +++ b/roles/tripleo_overcloud_support_report_collect/defaults/main.yml @@ -2,6 +2,7 @@ # defaults file for tripleo_overcloud_support_report_collect openstack_bin: openstack tripleo_overcloud_support_report_collect_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_support_report_collect_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_support_report_collect_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_support_report_collect_debug: false tripleo_overcloud_support_report_collect_server_name: diff --git a/roles/tripleo_overcloud_support_report_collect/tasks/main.yml b/roles/tripleo_overcloud_support_report_collect/tasks/main.yml index f433df4..20e89c5 100644 --- a/roles/tripleo_overcloud_support_report_collect/tasks/main.yml +++ b/roles/tripleo_overcloud_support_report_collect/tasks/main.yml @@ -33,6 +33,9 @@ environment: "{{ _report_env }}" register: tripleo_overcloud_support_report_collect_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_support_report_collect_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_update_converge/README.md b/roles/tripleo_overcloud_update_converge/README.md index 36b09c9..e2e95bc 100644 --- a/roles/tripleo_overcloud_update_converge/README.md +++ b/roles/tripleo_overcloud_update_converge/README.md @@ -24,6 +24,7 @@ Role Variables * `tripleo_overcloud_update_converge_environment_files`: (List) A list of environment file paths for the deployment. Should not be used with environment dirs. * `tripleo_overcloud_update_converge_force_postconfig`: (Boolean) Force the overclodu post-deployment configuration. Default: false * `tripleo_overcloud_update_converge_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_update_converge_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_update_converge_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_update_converge_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_update_converge_inflight_validations`: (Boolean) Flag to enable inflight validations. Default: false * `tripleo_overcloud_update_converge_libvirt_type`: (String) Libvirt domain time. Setting `NovaComputeLibvirtType` in an environment file is prefered over this option. diff --git a/roles/tripleo_overcloud_update_converge/defaults/main.yml b/roles/tripleo_overcloud_update_converge/defaults/main.yml index 1e43065..478c9f1 100644 --- a/roles/tripleo_overcloud_update_converge/defaults/main.yml +++ b/roles/tripleo_overcloud_update_converge/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_overcloud_update_converge_environment_dirs: [] tripleo_overcloud_update_converge_environment_files: [] tripleo_overcloud_update_converge_force_postconfig: false tripleo_overcloud_update_converge_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_update_converge_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_update_converge_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_update_converge_inflight_validations: false tripleo_overcloud_update_converge_libvirt_type: diff --git a/roles/tripleo_overcloud_update_converge/tasks/main.yml b/roles/tripleo_overcloud_update_converge/tasks/main.yml index 99d5f44..fe0409c 100644 --- a/roles/tripleo_overcloud_update_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_update_converge/tasks/main.yml @@ -98,7 +98,9 @@ async: "{{ tripleo_overcloud_update_converge_timeout }}" poll: "{{ tripleo_overcloud_update_converge_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_update_converge_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_update_prepare/README.md b/roles/tripleo_overcloud_update_prepare/README.md index aea3917..cd2c3d0 100644 --- a/roles/tripleo_overcloud_update_prepare/README.md +++ b/roles/tripleo_overcloud_update_prepare/README.md @@ -23,6 +23,7 @@ Role Variables * `tripleo_overcloud_update_prepare_environment_files`: (List) A list of environment file paths for the deployment. Should not be used with environment dirs. * `tripleo_overcloud_update_prepare_force_postconfig`: (Boolean) Force the overclodu post-deployment configuration. Default: false * `tripleo_overcloud_update_prepare_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_update_prepare_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_update_prepare_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_update_prepare_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_update_prepare_inflight_validations`: (Boolean) Flag to enable inflight validations. Default: false * `tripleo_overcloud_update_prepare_libvirt_type`: (String) Libvirt domain time. Setting `NovaComputeLibvirtType` in an environment file is prefered over this option. diff --git a/roles/tripleo_overcloud_update_prepare/defaults/main.yml b/roles/tripleo_overcloud_update_prepare/defaults/main.yml index 5256864..9d4b18f 100644 --- a/roles/tripleo_overcloud_update_prepare/defaults/main.yml +++ b/roles/tripleo_overcloud_update_prepare/defaults/main.yml @@ -13,6 +13,7 @@ tripleo_overcloud_update_prepare_environment_dirs: [] tripleo_overcloud_update_prepare_environment_files: [] tripleo_overcloud_update_prepare_force_postconfig: false tripleo_overcloud_update_prepare_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_update_prepare_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_update_prepare_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_update_prepare_inflight_validations: false tripleo_overcloud_update_prepare_libvirt_type: diff --git a/roles/tripleo_overcloud_update_prepare/tasks/main.yml b/roles/tripleo_overcloud_update_prepare/tasks/main.yml index 9c55de9..c785360 100644 --- a/roles/tripleo_overcloud_update_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_update_prepare/tasks/main.yml @@ -100,7 +100,9 @@ async: "{{ tripleo_overcloud_update_prepare_timeout }}" poll: "{{ tripleo_overcloud_update_prepare_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_update_prepare_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_update_run/README.md b/roles/tripleo_overcloud_update_run/README.md index 56a946e..408c40d 100644 --- a/roles/tripleo_overcloud_update_run/README.md +++ b/roles/tripleo_overcloud_update_run/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_update_run_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_update_run_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_update_run_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_update_run_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_update_run_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_update_run_limit`: (String) String that identifies a single node or a list of nodes to be upgraded. * `tripleo_overcloud_update_run_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true diff --git a/roles/tripleo_overcloud_update_run/defaults/main.yml b/roles/tripleo_overcloud_update_run/defaults/main.yml index 922f92d..c1fe1d0 100644 --- a/roles/tripleo_overcloud_update_run/defaults/main.yml +++ b/roles/tripleo_overcloud_update_run/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_update_run_debug: false tripleo_overcloud_update_run_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_update_run_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_update_run_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_update_run_limit: tripleo_overcloud_update_run_log: "{{ tripleo_overcloud_update_run_home_dir }}/overcloud_update_run.log" diff --git a/roles/tripleo_overcloud_update_run/tasks/main.yml b/roles/tripleo_overcloud_update_run/tasks/main.yml index 41e544b..7be1531 100644 --- a/roles/tripleo_overcloud_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_update_run/tasks/main.yml @@ -53,7 +53,9 @@ async: "{{ tripleo_overcloud_update_run_timeout }}" poll: "{{ tripleo_overcloud_update_run_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_update_run_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_upgrade_converge/README.md b/roles/tripleo_overcloud_upgrade_converge/README.md index a11cd8b..3f93ec4 100644 --- a/roles/tripleo_overcloud_upgrade_converge/README.md +++ b/roles/tripleo_overcloud_upgrade_converge/README.md @@ -24,6 +24,7 @@ Role Variables * `tripleo_overcloud_upgrade_converge_environment_files`: (List) A list of environment file paths for the deployment. Should not be used with environment dirs. * `tripleo_overcloud_upgrade_converge_force_postconfig`: (Boolean) Force the overclodu post-deployment configuration. Default: false * `tripleo_overcloud_upgrade_converge_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_upgrade_converge_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_upgrade_converge_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_upgrade_converge_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_upgrade_converge_inflight_validations`: (Boolean) Flag to enable inflight validations. Default: false * `tripleo_overcloud_upgrade_converge_libvirt_type`: (String) Libvirt domain time. Setting `NovaComputeLibvirtType` in an environment file is prefered over this option. diff --git a/roles/tripleo_overcloud_upgrade_converge/defaults/main.yml b/roles/tripleo_overcloud_upgrade_converge/defaults/main.yml index a76c520..c235f05 100644 --- a/roles/tripleo_overcloud_upgrade_converge/defaults/main.yml +++ b/roles/tripleo_overcloud_upgrade_converge/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_overcloud_upgrade_converge_environment_dirs: [] tripleo_overcloud_upgrade_converge_environment_files: [] tripleo_overcloud_upgrade_converge_force_postconfig: false tripleo_overcloud_upgrade_converge_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_upgrade_converge_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_upgrade_converge_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_upgrade_converge_inflight_validations: false tripleo_overcloud_upgrade_converge_libvirt_type: diff --git a/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml b/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml index ea185bf..413be10 100644 --- a/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_converge/tasks/main.yml @@ -98,7 +98,9 @@ async: "{{ tripleo_overcloud_upgrade_converge_timeout }}" poll: "{{ tripleo_overcloud_upgrade_converge_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_upgrade_converge_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_upgrade_prepare/README.md b/roles/tripleo_overcloud_upgrade_prepare/README.md index f6b86f6..9faaba6 100644 --- a/roles/tripleo_overcloud_upgrade_prepare/README.md +++ b/roles/tripleo_overcloud_upgrade_prepare/README.md @@ -24,6 +24,7 @@ Role Variables * `tripleo_overcloud_upgrade_prepare_environment_files`: (List) A list of environment file paths for the deployment. Should not be used with environment dirs. * `tripleo_overcloud_upgrade_prepare_force_postconfig`: (Boolean) Force the overclodu post-deployment configuration. Default: false * `tripleo_overcloud_upgrade_prepare_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_upgrade_prepare_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_upgrade_prepare_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_upgrade_prepare_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_upgrade_prepare_inflight_validations`: (Boolean) Flag to enable inflight validations. Default: false * `tripleo_overcloud_upgrade_prepare_libvirt_type`: (String) Libvirt domain time. Setting `NovaComputeLibvirtType` in an environment file is prefered over this option. diff --git a/roles/tripleo_overcloud_upgrade_prepare/defaults/main.yml b/roles/tripleo_overcloud_upgrade_prepare/defaults/main.yml index 45d2fae..9898eb5 100644 --- a/roles/tripleo_overcloud_upgrade_prepare/defaults/main.yml +++ b/roles/tripleo_overcloud_upgrade_prepare/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_overcloud_upgrade_prepare_environment_dirs: [] tripleo_overcloud_upgrade_prepare_environment_files: [] tripleo_overcloud_upgrade_prepare_force_postconfig: false tripleo_overcloud_upgrade_prepare_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_upgrade_prepare_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_upgrade_prepare_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_upgrade_prepare_inflight_validations: false tripleo_overcloud_upgrade_prepare_libvirt_type: diff --git a/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml b/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml index 3deff93..95b7440 100644 --- a/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_prepare/tasks/main.yml @@ -98,7 +98,9 @@ async: "{{ tripleo_overcloud_upgrade_prepare_timeout }}" poll: "{{ tripleo_overcloud_upgrade_prepare_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_upgrade_prepare_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_overcloud_upgrade_run/README.md b/roles/tripleo_overcloud_upgrade_run/README.md index 1cff70e..6d8ceeb 100644 --- a/roles/tripleo_overcloud_upgrade_run/README.md +++ b/roles/tripleo_overcloud_upgrade_run/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_overcloud_upgrade_run_debug`: (Boolean) Flag to print out the command that is run. Default: false * `tripleo_overcloud_upgrade_run_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_overcloud_upgrade_run_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_overcloud_upgrade_run_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_overcloud_upgrade_run_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" * `tripleo_overcloud_upgrade_run_limit`: (String) String that identifies a single node or a list of nodes to be upgraded. * `tripleo_overcloud_upgrade_run_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true diff --git a/roles/tripleo_overcloud_upgrade_run/defaults/main.yml b/roles/tripleo_overcloud_upgrade_run/defaults/main.yml index be916cc..4510dc5 100644 --- a/roles/tripleo_overcloud_upgrade_run/defaults/main.yml +++ b/roles/tripleo_overcloud_upgrade_run/defaults/main.yml @@ -3,6 +3,7 @@ openstack_bin: openstack tripleo_overcloud_upgrade_run_debug: false tripleo_overcloud_upgrade_run_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_overcloud_upgrade_run_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_overcloud_upgrade_run_home_dir: "{{ ansible_env.HOME }}" tripleo_overcloud_upgrade_run_limit: tripleo_overcloud_upgrade_run_log: "{{ tripleo_overcloud_upgrade_run_home_dir }}/overcloud_upgrade_run.log" diff --git a/roles/tripleo_overcloud_upgrade_run/tasks/main.yml b/roles/tripleo_overcloud_upgrade_run/tasks/main.yml index 679078f..a33685d 100644 --- a/roles/tripleo_overcloud_upgrade_run/tasks/main.yml +++ b/roles/tripleo_overcloud_upgrade_run/tasks/main.yml @@ -57,7 +57,9 @@ async: "{{ tripleo_overcloud_upgrade_run_timeout }}" poll: "{{ tripleo_overcloud_upgrade_run_poll }}" changed_when: false - when: not ansible_check_mode|bool + when: + - not ansible_check_mode|bool + - not tripleo_overcloud_upgrade_run_generate_scripts_only|bool - name: Set output fact set_fact: diff --git a/roles/tripleo_undercloud_backup/README.md b/roles/tripleo_undercloud_backup/README.md index 61bfbd9..fe9df06 100644 --- a/roles/tripleo_undercloud_backup/README.md +++ b/roles/tripleo_undercloud_backup/README.md @@ -14,6 +14,7 @@ Role Variables * `tripleo_undercloud_backup_add_path`: (List) List of additional filesystem paths to backup. Default: [] * `tripleo_undercloud_backup_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_undercloud_backup_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_undercloud_backup_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_undercloud_backup_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_undercloud_backup_exclude_path`: (List) List of filesystems path to skip backing up. Default: [] * `tripleo_undercloud_backup_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" * `tripleo_undercloud_backup_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true diff --git a/roles/tripleo_undercloud_backup/defaults/main.yml b/roles/tripleo_undercloud_backup/defaults/main.yml index e1bb938..bda98bc 100644 --- a/roles/tripleo_undercloud_backup/defaults/main.yml +++ b/roles/tripleo_undercloud_backup/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_undercloud_backup_add_path: [] tripleo_undercloud_backup_debug: false tripleo_undercloud_backup_exclude_path: [] tripleo_undercloud_backup_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_undercloud_backup_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_undercloud_backup_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_backup_log: "{{ tripleo_undercloud_backup_home_dir }}/undercloud_backup.log" tripleo_undercloud_backup_log_combine: true diff --git a/roles/tripleo_undercloud_backup/tasks/main.yml b/roles/tripleo_undercloud_backup/tasks/main.yml index 1439995..9725eaa 100644 --- a/roles/tripleo_undercloud_backup/tasks/main.yml +++ b/roles/tripleo_undercloud_backup/tasks/main.yml @@ -42,3 +42,6 @@ poll: "{{ tripleo_undercloud_backup_poll }}" register: tripleo_undercloud_backup_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_undercloud_backup_generate_scripts_only|bool diff --git a/roles/tripleo_undercloud_install/README.md b/roles/tripleo_undercloud_install/README.md index 555e2fd..6fd206c 100644 --- a/roles/tripleo_undercloud_install/README.md +++ b/roles/tripleo_undercloud_install/README.md @@ -15,6 +15,7 @@ Role Variables * `tripleo_undercloud_install_dry_run`: (Boolean) Flag to add --dry-run to the install. Default: false * `tripleo_undercloud_install_force_stack_update`: (Boolean) Flag to add --force-stack-update to the install. Default: false * `tripleo_undercloud_install_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_undercloud_install_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_undercloud_install_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_undercloud_install_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" * `tripleo_undercloud_install_inflight_validations`: (Boolean) Flag to add --inflight-validations to the install. Default: false * `tripleo_undercloud_install_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true diff --git a/roles/tripleo_undercloud_install/defaults/main.yml b/roles/tripleo_undercloud_install/defaults/main.yml index 2f9f4f3..8bf518d 100644 --- a/roles/tripleo_undercloud_install/defaults/main.yml +++ b/roles/tripleo_undercloud_install/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_undercloud_install_debug: false tripleo_undercloud_install_dry_run: false tripleo_undercloud_install_force_stack_update: false tripleo_undercloud_install_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_undercloud_install_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_undercloud_install_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_install_inflight_validations: false tripleo_undercloud_install_log_combine: true diff --git a/roles/tripleo_undercloud_install/tasks/main.yml b/roles/tripleo_undercloud_install/tasks/main.yml index 1ec74d4..33fc5ac 100644 --- a/roles/tripleo_undercloud_install/tasks/main.yml +++ b/roles/tripleo_undercloud_install/tasks/main.yml @@ -45,3 +45,6 @@ poll: "{{ tripleo_undercloud_install_poll }}" register: tripleo_undercloud_install_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_undercloud_install_generate_scripts_only|bool diff --git a/roles/tripleo_undercloud_minion_install/README.md b/roles/tripleo_undercloud_minion_install/README.md index 8ec9ebb..0dcd311 100644 --- a/roles/tripleo_undercloud_minion_install/README.md +++ b/roles/tripleo_undercloud_minion_install/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_undercloud_minion_install_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_undercloud_minion_install_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_undercloud_minion_install_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_undercloud_minion_install_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_undercloud_minion_install_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" * `tripleo_undercloud_minion_install_dry_run`: (Boolean) Flag to add --dry-run to the install. Default: false * `tripleo_undercloud_minion_install_force_stack_update`: (Boolean) Flag to add --force-stack-update to the install. Default: false diff --git a/roles/tripleo_undercloud_minion_install/defaults/main.yml b/roles/tripleo_undercloud_minion_install/defaults/main.yml index 8958efc..c7ab3f0 100644 --- a/roles/tripleo_undercloud_minion_install/defaults/main.yml +++ b/roles/tripleo_undercloud_minion_install/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_undercloud_minion_install_debug: false tripleo_undercloud_minion_install_dry_run: false tripleo_undercloud_minion_install_force_stack_update: false tripleo_undercloud_minion_install_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_undercloud_minion_install_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_undercloud_minion_install_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_minion_install_log: "{{ tripleo_undercloud_minion_install_home_dir }}/undercloud_minion_install.log" tripleo_undercloud_minion_install_log_combine: true diff --git a/roles/tripleo_undercloud_minion_install/tasks/main.yml b/roles/tripleo_undercloud_minion_install/tasks/main.yml index 9e939a0..46a5b80 100644 --- a/roles/tripleo_undercloud_minion_install/tasks/main.yml +++ b/roles/tripleo_undercloud_minion_install/tasks/main.yml @@ -43,3 +43,6 @@ poll: "{{ tripleo_undercloud_minion_install_poll }}" register: tripleo_undercloud_minion_install_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_undercloud_minion_install_generate_scripts_only|bool diff --git a/roles/tripleo_undercloud_minion_upgrade/README.md b/roles/tripleo_undercloud_minion_upgrade/README.md index c2f6d0a..aeaa2b6 100644 --- a/roles/tripleo_undercloud_minion_upgrade/README.md +++ b/roles/tripleo_undercloud_minion_upgrade/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_undercloud_minion_upgrade_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_undercloud_minion_upgrade_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_undercloud_minion_upgrade_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_undercloud_minion_upgrade_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_undercloud_minion_upgrade_dry_run`: (Boolean) Flag to add --dry-run to the upgrade command. Default: false * `tripleo_undercloud_minion_upgrade_force_stack_update`: (Boolean) Flag to add --force-stack-update to the upgrade command. Default: false * `tripleo_undercloud_minion_upgrade_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" diff --git a/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml b/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml index 6d76ba6..49f9a96 100644 --- a/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml +++ b/roles/tripleo_undercloud_minion_upgrade/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_undercloud_minion_upgrade_debug: false tripleo_undercloud_minion_upgrade_dry_run: false tripleo_undercloud_minion_upgrade_force_stack_update: false tripleo_undercloud_minion_upgrade_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_undercloud_minion_upgrade_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_undercloud_minion_upgrade_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_minion_upgrade_log: "{{ tripleo_undercloud_minion_upgrade_home_dir }}/undercloud_minion_upgrade.log" tripleo_undercloud_minion_upgrade_log_combine: true diff --git a/roles/tripleo_undercloud_minion_upgrade/tasks/main.yml b/roles/tripleo_undercloud_minion_upgrade/tasks/main.yml index d797412..ac015e1 100644 --- a/roles/tripleo_undercloud_minion_upgrade/tasks/main.yml +++ b/roles/tripleo_undercloud_minion_upgrade/tasks/main.yml @@ -43,3 +43,6 @@ poll: "{{ tripleo_undercloud_minion_upgrade_poll }}" register: tripleo_undercloud_minion_upgrade_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_undercloud_minion_upgrade_generate_scripts_only|bool diff --git a/roles/tripleo_undercloud_upgrade/README.md b/roles/tripleo_undercloud_upgrade/README.md index cb90de1..1c257bd 100644 --- a/roles/tripleo_undercloud_upgrade/README.md +++ b/roles/tripleo_undercloud_upgrade/README.md @@ -13,6 +13,7 @@ Role Variables * `tripleo_undercloud_upgrade_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_undercloud_upgrade_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined. +* `tripleo_undercloud_upgrade_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjonction with `tripleo_undercloud_upgrade_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined. * `tripleo_undercloud_upgrade_dry_run`: (Boolean) Flag to add --dry-run to the upgrade command. Default: false * `tripleo_undercloud_upgrade_force_stack_update`: (Boolean) Flag to add --force-stack-update to the upgrade command. Default: false * `tripleo_undercloud_upgrade_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" diff --git a/roles/tripleo_undercloud_upgrade/defaults/main.yml b/roles/tripleo_undercloud_upgrade/defaults/main.yml index 80c5ffa..e17dcb5 100644 --- a/roles/tripleo_undercloud_upgrade/defaults/main.yml +++ b/roles/tripleo_undercloud_upgrade/defaults/main.yml @@ -5,6 +5,7 @@ tripleo_undercloud_upgrade_debug: false tripleo_undercloud_upgrade_dry_run: false tripleo_undercloud_upgrade_force_stack_update: false tripleo_undercloud_upgrade_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" +tripleo_undercloud_upgrade_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_undercloud_upgrade_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_upgrade_inflight_validations: false tripleo_undercloud_upgrade_log: "{{ tripleo_undercloud_upgrade_home_dir }}/undercloud_upgrade.log" diff --git a/roles/tripleo_undercloud_upgrade/tasks/main.yml b/roles/tripleo_undercloud_upgrade/tasks/main.yml index 19ed85b..03ee0ab 100644 --- a/roles/tripleo_undercloud_upgrade/tasks/main.yml +++ b/roles/tripleo_undercloud_upgrade/tasks/main.yml @@ -45,3 +45,6 @@ poll: "{{ tripleo_undercloud_upgrade_poll }}" register: tripleo_undercloud_upgrade_result changed_when: true + when: + - not ansible_check_mode|bool + - not tripleo_undercloud_upgrade_generate_scripts_only|bool