diff --git a/roles/tripleo_overcloud_external_update_run/README.md b/roles/tripleo_overcloud_external_update_run/README.md index e09573d..96f9be5 100644 --- a/roles/tripleo_overcloud_external_update_run/README.md +++ b/roles/tripleo_overcloud_external_update_run/README.md @@ -27,6 +27,7 @@ Role Variables * `tripleo_overcloud_external_update_run_static_inventory`: (String) Path to an existing ansible inventory to use. * `tripleo_overcloud_external_update_run_tags`: (String) A string specifying the tag or comma separate list of tags to be passed as --tags to the playbook. * `tripleo_overcloud_external_update_run_timeout`: (Integer) Number in seconds to wait for the ansible execution of the deployment command to finish. Default: 5700 +* 'tripleo_overcloud_external_update_run_yes': (Boolean) Flag to skip the confirmation required before any update prepare operation. Default: true NOTE: Please note that this command should be run against the undercloud so the OS_CLOUD or rc file variables should be set to use the 'undercloud' when diff --git a/roles/tripleo_overcloud_external_update_run/defaults/main.yml b/roles/tripleo_overcloud_external_update_run/defaults/main.yml index 1eca3c9..d0c66be 100644 --- a/roles/tripleo_overcloud_external_update_run/defaults/main.yml +++ b/roles/tripleo_overcloud_external_update_run/defaults/main.yml @@ -19,3 +19,4 @@ tripleo_overcloud_external_update_run_stack: tripleo_overcloud_external_update_run_static_inventory: tripleo_overcloud_external_update_run_tags: tripleo_overcloud_external_update_run_timeout: 5700 +tripleo_overcloud_external_update_run_yes: true diff --git a/roles/tripleo_overcloud_external_update_run/molecule/default/converge.yml b/roles/tripleo_overcloud_external_update_run/molecule/default/converge.yml index 8356de6..3e5f3a8 100644 --- a/roles/tripleo_overcloud_external_update_run/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_external_update_run/molecule/default/converge.yml @@ -10,6 +10,7 @@ tripleo_overcloud_external_update_run_log_output: false tripleo_overcloud_external_update_run_log_combine: false tripleo_overcloud_external_update_run_poll: 1 + tripleo_overcloud_external_update_run_yes: false tasks: - name: "Include tripleo_overcloud_external_update_run" @@ -46,6 +47,17 @@ that: - tripleo_overcloud_external_update_run_output == "overcloud external-update run --stack test" + - name: Check parameter "tripleo_overcloud_external_update_run_yes" + include_role: + name: "tripleo_overcloud_external_update_run" + vars: + tripleo_overcloud_external_update_run_yes: true + + - name: Assert "tripleo_overcloud_external_update_run_yes" + assert: + that: + - tripleo_overcloud_external_update_run_output == "overcloud external-update run --yes" + - name: Check parameter "tripleo_overcloud_external_update_run_tags" include_role: name: "tripleo_overcloud_external_update_run" diff --git a/roles/tripleo_overcloud_external_update_run/tasks/main.yml b/roles/tripleo_overcloud_external_update_run/tasks/main.yml index 1099f1a..cdc098d 100644 --- a/roles/tripleo_overcloud_external_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_external_update_run/tasks/main.yml @@ -11,6 +11,7 @@ {{ tripleo_overcloud_external_update_run_skip_tags | ternary('--skip-tags $UPDATE_SKIP_TAGS', '') }} {{ tripleo_overcloud_external_update_run_static_inventory | ternary('--static-inventory $UPDATE_STATIC_INVENTORY', '') }} {{ tripleo_overcloud_external_update_run_stack | ternary('--stack $UPDATE_STACK', '') }} + {{ tripleo_overcloud_external_update_run_yes | ternary('--yes', '') }} {{ tripleo_overcloud_external_update_run_log_output | ternary((">" ~ tripleo_overcloud_external_update_run_log), '') }} {{ tripleo_overcloud_external_update_run_log_combine | ternary("2>&1", '') }} _update_run_env: diff --git a/roles/tripleo_overcloud_update_converge/README.md b/roles/tripleo_overcloud_update_converge/README.md index 41d5206..13b7351 100644 --- a/roles/tripleo_overcloud_update_converge/README.md +++ b/roles/tripleo_overcloud_update_converge/README.md @@ -57,6 +57,7 @@ Role Variables * `tripleo_overcloud_update_converge_timeout`: (Integer) Number in seconds to wait for the ansible execution of the deployment command to finish. This should be larger than the `tripleo_overcloud_update_converge_timeout_arg` value. Default: 5700 * `tripleo_overcloud_update_converge_validation_errors_nonfatal`: (Boolean) Flag to make validation errors not fatal. Default: false * `tripleo_overcloud_update_converge_validation_warnings_fatal`: (Boolean) Flag to make validation warnings fatal. Default: false +* 'tripleo_overcloud_update_converge_yes': (Boolean) Flag to skip the confirmation required before any update converge operation. Default: true NOTE: Please note that this command should be run against the undercloud so the OS_CLOUD or rc file variables should be set to use the 'undercloud' when diff --git a/roles/tripleo_overcloud_update_converge/defaults/main.yml b/roles/tripleo_overcloud_update_converge/defaults/main.yml index b5747b3..77d2a23 100644 --- a/roles/tripleo_overcloud_update_converge/defaults/main.yml +++ b/roles/tripleo_overcloud_update_converge/defaults/main.yml @@ -47,3 +47,4 @@ tripleo_overcloud_update_converge_timeout: 5700 tripleo_overcloud_update_converge_timeout_arg: 90 tripleo_overcloud_update_converge_validation_errors_nonfatal: false tripleo_overcloud_update_converge_validation_warnings_fatal: false +tripleo_overcloud_update_converge_yes: true diff --git a/roles/tripleo_overcloud_update_converge/molecule/default/converge.yml b/roles/tripleo_overcloud_update_converge/molecule/default/converge.yml index e3525f7..0304ab9 100644 --- a/roles/tripleo_overcloud_update_converge/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_update_converge/molecule/default/converge.yml @@ -10,6 +10,7 @@ tripleo_overcloud_update_converge_log_output: false tripleo_overcloud_update_converge_log_combine: false tripleo_overcloud_update_converge_poll: 1 + tripleo_overcloud_update_converge_yes: false tasks: - name: "Include tripleo_overcloud_update_converge" @@ -35,6 +36,20 @@ that: - tripleo_overcloud_update_converge_output == "overcloud update converge --stack test" + - name: Check parameter "tripleo_overcloud_update_converge_yes" + include_role: + name: "tripleo_overcloud_update_converge" + vars: + tripleo_overcloud_update_converge_stack: + tripleo_overcloud_update_converge_templates: + tripleo_overcloud_update_converge_timeout_arg: + tripleo_overcloud_update_converge_yes: true + + - name: Assert "tripleo_overcloud_update_converge_yes" + assert: + that: + - tripleo_overcloud_update_converge_output == "overcloud update converge --yes" + - name: Check parameter "tripleo_overcloud_update_converge_libvirt_type" include_role: name: "tripleo_overcloud_update_converge" diff --git a/roles/tripleo_overcloud_update_converge/tasks/main.yml b/roles/tripleo_overcloud_update_converge/tasks/main.yml index ad098de..9da0870 100644 --- a/roles/tripleo_overcloud_update_converge/tasks/main.yml +++ b/roles/tripleo_overcloud_update_converge/tasks/main.yml @@ -40,6 +40,7 @@ {{ tripleo_overcloud_update_converge_override_ansible_cfg | ternary('--override-ansible-cfg $UPDATE_OVERRIDE_ANSIBLE_CFG', '') }} {{ tripleo_overcloud_update_converge_config_download_timeout | ternary('--config-download-timeout $UPDATE_CONFIG_DOWNLOAD_TIMEOUT', '') }} {{ tripleo_overcloud_update_converge_baremetal_deployment | ternary('--baremetal-deployment $UPDATE_BAREMETAL_DEPLOYMENT', '') }} + {{ tripleo_overcloud_update_converge_yes | ternary('--yes', '') }} {{ tripleo_overcloud_update_converge_log_output | ternary((">" ~ tripleo_overcloud_update_converge_log), '') }} {{ tripleo_overcloud_update_converge_log_combine | ternary("2>&1", '') }} _update_converge_env: diff --git a/roles/tripleo_overcloud_update_prepare/README.md b/roles/tripleo_overcloud_update_prepare/README.md index 6526d12..a8c45d5 100644 --- a/roles/tripleo_overcloud_update_prepare/README.md +++ b/roles/tripleo_overcloud_update_prepare/README.md @@ -58,6 +58,7 @@ Role Variables * `tripleo_overcloud_update_prepare_update_preparement_python_interpreter`: (String) Path to a python interpreter for the deployment actions. * `tripleo_overcloud_update_prepare_validation_errors_nonfatal`: (Boolean) Flag to make validation errors not fatal. Default: false * `tripleo_overcloud_update_prepare_validation_warnings_fatal`: (Boolean) Flag to make validation warnings fatal. Default: false +* 'tripleo_overcloud_update_prepare_yes': (Boolean) Flag to skip the confirmation required before any update prepare operation. Default: true NOTE: Please note that this command should be run against the undercloud so the OS_CLOUD or rc file variables should be set to use the 'undercloud' when diff --git a/roles/tripleo_overcloud_update_prepare/defaults/main.yml b/roles/tripleo_overcloud_update_prepare/defaults/main.yml index eb4904e..d7a64d8 100644 --- a/roles/tripleo_overcloud_update_prepare/defaults/main.yml +++ b/roles/tripleo_overcloud_update_prepare/defaults/main.yml @@ -48,3 +48,4 @@ tripleo_overcloud_update_prepare_update_prepareed_server: false tripleo_overcloud_update_prepare_update_preparement_python_interpreter: tripleo_overcloud_update_prepare_validation_errors_nonfatal: false tripleo_overcloud_update_prepare_validation_warnings_fatal: false +tripleo_overcloud_update_prepare_yes: true diff --git a/roles/tripleo_overcloud_update_prepare/molecule/default/converge.yml b/roles/tripleo_overcloud_update_prepare/molecule/default/converge.yml index df69df4..f7d9a15 100644 --- a/roles/tripleo_overcloud_update_prepare/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_update_prepare/molecule/default/converge.yml @@ -9,6 +9,7 @@ tripleo_overcloud_update_prepare_debug: true tripleo_overcloud_update_prepare_log_output: false tripleo_overcloud_update_prepare_log_combine: false + tripleo_overcloud_update_prepare_yes: false tripleo_overcloud_update_prepare_poll: 1 tasks: @@ -35,6 +36,20 @@ that: - tripleo_overcloud_update_prepare_output == "overcloud update prepare --stack test" + - name: Check parameter "tripleo_overcloud_update_prepare_yes" + include_role: + name: "tripleo_overcloud_update_prepare" + vars: + tripleo_overcloud_update_prepare_stack: + tripleo_overcloud_update_prepare_templates: + tripleo_overcloud_update_prepare_timeout_arg: + tripleo_overcloud_update_prepare_yes: true + + - name: Assert "tripleo_overcloud_update_prepare_yes" + assert: + that: + - tripleo_overcloud_update_prepare_output == "overcloud update prepare --yes" + - name: Check parameter "tripleo_overcloud_update_prepare_libvirt_type" include_role: name: "tripleo_overcloud_update_prepare" diff --git a/roles/tripleo_overcloud_update_prepare/tasks/main.yml b/roles/tripleo_overcloud_update_prepare/tasks/main.yml index 8f6f87d..109a878 100644 --- a/roles/tripleo_overcloud_update_prepare/tasks/main.yml +++ b/roles/tripleo_overcloud_update_prepare/tasks/main.yml @@ -41,6 +41,7 @@ {{ tripleo_overcloud_update_prepare_config_download_timeout | ternary('--config-download-timeout $UPDATE_CONFIG_DOWNLOAD_TIMEOUT', '') }} {{ tripleo_overcloud_update_prepare_update_preparement_python_interpreter | ternary('--deployment-python-interpreter $UPDATE_PYTHON_INTERPRETER', '') }} {{ tripleo_overcloud_update_prepare_baremetal_deployment | ternary('--baremetal-deployment $UPDATE_BAREMETAL_DEPLOYMENT', '') }} + {{ tripleo_overcloud_update_prepare_yes | ternary('--yes', '') }} {{ tripleo_overcloud_update_prepare_log_output | ternary((">" ~ tripleo_overcloud_update_prepare_log), '') }} {{ tripleo_overcloud_update_prepare_log_combine | ternary("2>&1", '') }} _update_prepare_env: diff --git a/roles/tripleo_overcloud_update_run/README.md b/roles/tripleo_overcloud_update_run/README.md index 02545b6..aa1bba4 100644 --- a/roles/tripleo_overcloud_update_run/README.md +++ b/roles/tripleo_overcloud_update_run/README.md @@ -26,6 +26,7 @@ Role Variables * `tripleo_overcloud_update_run_stack`: (String) Name of the stack to deploy. * `tripleo_overcloud_update_run_static_inventory`: (String) Path to an existing ansible inventory to use. * `tripleo_overcloud_update_run_timeout`: (Integer) Number in seconds to wait for the ansible execution of the deployment command to finish. Default: 5700 +* 'tripleo_overcloud_update_run_yes': (Boolean) Flag to skip the confirmation required before any update run operation. Default: true NOTE: Please note that this command should be run against the undercloud so the OS_CLOUD or rc file variables should be set to use the 'undercloud' when diff --git a/roles/tripleo_overcloud_update_run/defaults/main.yml b/roles/tripleo_overcloud_update_run/defaults/main.yml index c1fe1d0..058a2b8 100644 --- a/roles/tripleo_overcloud_update_run/defaults/main.yml +++ b/roles/tripleo_overcloud_update_run/defaults/main.yml @@ -17,3 +17,4 @@ tripleo_overcloud_update_run_ssh_user: tripleo_overcloud_update_run_stack: tripleo_overcloud_update_run_static_inventory: tripleo_overcloud_update_run_timeout: 5700 +tripleo_overcloud_update_run_yes: true diff --git a/roles/tripleo_overcloud_update_run/molecule/default/converge.yml b/roles/tripleo_overcloud_update_run/molecule/default/converge.yml index 784019e..1e3e37a 100644 --- a/roles/tripleo_overcloud_update_run/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_update_run/molecule/default/converge.yml @@ -10,6 +10,7 @@ tripleo_overcloud_update_run_log_output: false tripleo_overcloud_update_run_log_combine: false tripleo_overcloud_update_run_poll: 1 + tripleo_overcloud_update_run_yes: false tasks: - name: "Include tripleo_overcloud_update_run" @@ -32,6 +33,18 @@ that: - tripleo_overcloud_update_run_output == "overcloud update run --stack test" + - name: Check parameter "tripleo_overcloud_update_run_yes" + include_role: + name: "tripleo_overcloud_update_run" + vars: + tripleo_overcloud_update_run_stack: + tripleo_overcloud_update_run_yes: true + + - name: Assert "tripleo_overcloud_update_run_yes" + assert: + that: + - tripleo_overcloud_update_run_output == "overcloud update run --yes" + - name: Check parameter "tripleo_overcloud_update_run_playbook" include_role: name: "tripleo_overcloud_update_run" diff --git a/roles/tripleo_overcloud_update_run/tasks/main.yml b/roles/tripleo_overcloud_update_run/tasks/main.yml index 2597a2b..44b33ab 100644 --- a/roles/tripleo_overcloud_update_run/tasks/main.yml +++ b/roles/tripleo_overcloud_update_run/tasks/main.yml @@ -10,6 +10,7 @@ {{ tripleo_overcloud_update_run_ssh_user | ternary('--ssh-user $UPDATE_SSH_USER', '') }} {{ tripleo_overcloud_update_run_static_inventory | ternary('--static-inventory $UPDATE_STATIC_INVENTORY', '') }} {{ tripleo_overcloud_update_run_stack | ternary('--stack $UPDATE_STACK', '') }} + {{ tripleo_overcloud_update_run_yes | ternary('--yes', '') }} {{ tripleo_overcloud_update_run_log_output | ternary((">" ~ tripleo_overcloud_update_run_log), '') }} {{ tripleo_overcloud_update_run_log_combine | ternary("2>&1", '') }} _update_run_env: