From 85981996c41d2ff63ce3dc4d66fb31a2f3508c5d Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Tue, 23 Apr 2019 16:22:06 -0500 Subject: [PATCH] Allow for skipping custom env.d file checks Currently if the env.d check fails and halts the upgrade, re-running the run-upgrade.sh script doesn't pass the skip-tags flag to Ansible. This prompts the user to set the env variable if they want to further skip checks and then passes the skip-tags as necessary. Change-Id: Ic62887c7d8faa6a7a95021c012b1bf4f733edc33 --- scripts/upgrade-utilities/deploy-config-changes.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade-utilities/deploy-config-changes.yml b/scripts/upgrade-utilities/deploy-config-changes.yml index 8f256cf3d4..9b10e6a8a0 100644 --- a/scripts/upgrade-utilities/deploy-config-changes.yml +++ b/scripts/upgrade-utilities/deploy-config-changes.yml @@ -56,9 +56,11 @@ layout in {{ repo_root_dir }}/inventory/env.d. The difference between these files should be carefully reviewed to understand whether the changes are still necessary and applicable to the environment. If all the user-space env.d files are necessary, - then please re-run this playbook with the CLI option '--skip-tags custom-envd-file-check'. + then please export SKIP_CUSTOM_ENVD_CHECK=true and re-run the playbook or + run-upgrade.sh script. when: - _envd_dir_contents.matched > 0 + - not(lookup('env', 'SKIP_CUSTOM_ENVD_CHECK') | bool) tags: - custom-envd-file-check