From 0f09d317e30802bd5bf350a767f1535893c73847 Mon Sep 17 00:00:00 2001 From: Mike Morency Date: Sun, 27 Oct 2024 16:45:28 -0400 Subject: [PATCH] remove validate certs default for info role --- .../fragments/111-remove-info-validate-certs-default.yml | 3 +++ roles/info/defaults/main.yml | 2 +- roles/info/tasks/appliance_info.yml | 2 +- roles/info/tasks/cluster_info.yml | 4 ++-- roles/info/tasks/guest_info.yml | 2 +- roles/info/tasks/license_info.yml | 2 +- roles/info/tasks/storage_info.yml | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/111-remove-info-validate-certs-default.yml diff --git a/changelogs/fragments/111-remove-info-validate-certs-default.yml b/changelogs/fragments/111-remove-info-validate-certs-default.yml new file mode 100644 index 00000000..b9858a02 --- /dev/null +++ b/changelogs/fragments/111-remove-info-validate-certs-default.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - info - Remove redundant default value for info_validate_certs so the role is consistent with others diff --git a/roles/info/defaults/main.yml b/roles/info/defaults/main.yml index 0f9d7ff9..be631003 100644 --- a/roles/info/defaults/main.yml +++ b/roles/info/defaults/main.yml @@ -2,7 +2,7 @@ info_hostname: "{{ vmware_ops_collection_hostname }}" info_username: "{{ vmware_ops_collection_username }}" info_password: "{{ vmware_ops_collection_password }}" -info_validate_certs: "{{ vmware_ops_collection_validate_certs | default(true) }}" +info_validate_certs: "{{ vmware_ops_collection_validate_certs }}" info_port: "{{ vmware_ops_collection_port }}" info_expose_outputs_as_variable: true diff --git a/roles/info/tasks/appliance_info.yml b/roles/info/tasks/appliance_info.yml index 379049bc..f4a82f4a 100644 --- a/roles/info/tasks/appliance_info.yml +++ b/roles/info/tasks/appliance_info.yml @@ -4,7 +4,7 @@ username: "{{ info_username }}" password: "{{ info_password }}" port: "{{ info_port | d(omit) }}" - validate_certs: "{{ info_validate_certs }}" + validate_certs: "{{ info_validate_certs | default(omit) }}" properties: "{{ info_appliance_gather }}" register: __appliance diff --git a/roles/info/tasks/cluster_info.yml b/roles/info/tasks/cluster_info.yml index 66f80991..e77b501e 100644 --- a/roles/info/tasks/cluster_info.yml +++ b/roles/info/tasks/cluster_info.yml @@ -3,7 +3,7 @@ vcenter_hostname: "{{ info_hostport }}" vcenter_username: "{{ info_username }}" vcenter_password: "{{ info_password }}" - vcenter_validate_certs: "{{ info_validate_certs }}" + vcenter_validate_certs: "{{ info_validate_certs | default(omit) }}" register: __clusters tags: - cluster @@ -14,7 +14,7 @@ username: "{{ info_username }}" password: "{{ info_password }}" port: "{{ info_port | d(omit) }}" - validate_certs: "{{ info_validate_certs }}" + validate_certs: "{{ info_validate_certs | default(omit) }}" cluster_name: "{{ item.name }}" schema: vsphere properties: diff --git a/roles/info/tasks/guest_info.yml b/roles/info/tasks/guest_info.yml index a4a5ced7..fb84b47f 100644 --- a/roles/info/tasks/guest_info.yml +++ b/roles/info/tasks/guest_info.yml @@ -4,7 +4,7 @@ username: "{{ info_username }}" password: "{{ info_password }}" port: "{{ info_port | d(omit) }}" - validate_certs: "{{ info_validate_certs }}" + validate_certs: "{{ info_validate_certs | default(omit) }}" register: __guests - name: Write Guest Results To File diff --git a/roles/info/tasks/license_info.yml b/roles/info/tasks/license_info.yml index 0f83ef06..0ac3b7c1 100644 --- a/roles/info/tasks/license_info.yml +++ b/roles/info/tasks/license_info.yml @@ -4,7 +4,7 @@ username: "{{ info_username }}" password: "{{ info_password }}" port: "{{ info_port | d(omit) }}" - validate_certs: "{{ info_validate_certs }}" + validate_certs: "{{ info_validate_certs | default(omit) }}" register: __license - name: Write License Results To File diff --git a/roles/info/tasks/storage_info.yml b/roles/info/tasks/storage_info.yml index a5b54f92..b448b435 100644 --- a/roles/info/tasks/storage_info.yml +++ b/roles/info/tasks/storage_info.yml @@ -4,7 +4,7 @@ username: "{{ info_username }}" password: "{{ info_password }}" port: "{{ info_port | d(omit) }}" - validate_certs: "{{ info_validate_certs }}" + validate_certs: "{{ info_validate_certs | default(omit) }}" register: __storage_policy - name: Write Storage Policy Results To File