Fix validate certs for all roles

redhat-cop · Mar 10, 2021 · dd7a0e0 · dd7a0e0
1 parent aff13ba
commit dd7a0e0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/changelogs/fragments/validate-certs.yml 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
@@ -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
@@ -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
@@ -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
@@ -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: