From dd7a0e0a857533e22aeb87b392175f8b6ab1d5dd Mon Sep 17 00:00:00 2001 From: tpage Date: Wed, 10 Mar 2021 12:45:50 +0000 Subject: [PATCH] Fix validate certs for all roles --- changelogs/fragments/validate-certs.yml | 4 ++++ roles/hosts/tasks/main.yml | 2 +- roles/inventories/tasks/main.yml | 2 +- roles/notification_templates/tasks/main.yml | 2 +- roles/users/tasks/main.yml | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/validate-certs.yml diff --git a/changelogs/fragments/validate-certs.yml b/changelogs/fragments/validate-certs.yml new file mode 100644 index 000000000..7498a8b03 --- /dev/null +++ b/changelogs/fragments/validate-certs.yml @@ -0,0 +1,4 @@ +--- +bugfixes: + - Fixed an issue where certain roles were not taking in tower_validate_certs +... diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml index 2ca3c47ac..29191e50c 100644 --- a/roles/hosts/tasks/main.yml +++ b/roles/hosts/tasks/main.yml @@ -13,7 +13,7 @@ tower_password: "{{ tower_password | default(omit, true) }}" tower_oauthtoken: "{{ tower_oauthtoken | default(omit, true) }}" tower_config_file: "{{ tower_config_file | default(omit, true) }}" - validate_certs: "{{ tower_verify_ssl | default(true) }}" + validate_certs: "{{ tower_validate_certs | default('true') }}" loop: "{{ tower_hosts }}" loop_control: loop_var: tower_hosts_item diff --git a/roles/inventories/tasks/main.yml b/roles/inventories/tasks/main.yml index 3db054575..f6fed25e2 100644 --- a/roles/inventories/tasks/main.yml +++ b/roles/inventories/tasks/main.yml @@ -14,7 +14,7 @@ tower_username: "{{ tower_username | default(omit, true) }}" tower_password: "{{ tower_password | default(omit, true) }}" tower_oauthtoken: "{{ tower_oauthtoken | default(omit, true) }}" - validate_certs: "{{ tower_verify_ssl | default('False') }}" + validate_certs: "{{ tower_validate_certs | default('true') }}" loop: "{{ tower_inventories }}" loop_control: loop_var: inventory diff --git a/roles/notification_templates/tasks/main.yml b/roles/notification_templates/tasks/main.yml index 3c50235b9..1242c5b63 100644 --- a/roles/notification_templates/tasks/main.yml +++ b/roles/notification_templates/tasks/main.yml @@ -41,7 +41,7 @@ tower_password: "{{ tower_password | default(omit, true) }}" tower_oauthtoken: "{{ tower_oauthtoken | default(omit, true) }}" tower_config_file: "{{ tower_config_file | default(omit, true) }}" - validate_certs: "{{ validate_certs | default(tower_verify_ssl | default('true')) }}" + validate_certs: "{{ tower_validate_certs | default('true') }}" loop: "{{ tower_notifications }}" loop_control: loop_var: tower_notifications_item diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index a8f9b5ebb..7c5254b5d 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -15,7 +15,7 @@ tower_username: "{{ tower_username | default(omit, true) }}" tower_password: "{{ tower_password | default(omit, true) }}" tower_oauthtoken: "{{ tower_oauthtoken | default(omit, true) }}" - validate_certs: "{{ tower_verify_ssl | default(true) }}" + validate_certs: "{{ tower_validate_certs | default('true') }}" tower_config_file: "{{ tower_config_file | default(omit, true) }}" loop: "{{ tower_user_accounts }}" loop_control: