fix path when importing collection vars

redhat-cop · Oct 10, 2024 · 7c8c598 · 7c8c598
1 parent 0a8aa30
commit 7c8c598
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 21 deletions.
diff --git a/roles/cluster_settings/tasks/main.yml b/roles/cluster_settings/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/content_library/tasks/main.yml b/roles/content_library/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/deploy_ovf/tasks/main.yml b/roles/deploy_ovf/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Include Input Validation Tasks
   ansible.builtin.include_tasks: input_validation.yml

diff --git a/roles/esxi_maintenance_mode/tasks/main.yml b/roles/esxi_maintenance_mode/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/export_vm_as_ovf/tasks/main.yml b/roles/export_vm_as_ovf/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/info/defaults/main.yml b/roles/info/defaults/main.yml
@@ -2,10 +2,9 @@
 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 }}"
+info_validate_certs: "{{ vmware_ops_collection_validate_certs | default(true) }}"
 info_port: "{{ vmware_ops_collection_port }}"
 
-info_validate_certs: true
 info_expose_outputs_as_variable: true
 info_hostport: "{{ info_hostname + ':' + info_port if info_port is defined else info_hostname }}"
 

diff --git a/roles/info/tasks/main.yml b/roles/info/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: License info
   ansible.builtin.include_tasks: license_info.yml

diff --git a/roles/manage_folder/tasks/main.yml b/roles/manage_folder/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/provision_vcenter/tasks/main.yml b/roles/provision_vcenter/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Validate Inputs
   ansible.builtin.include_tasks: validate_inputs.yml

diff --git a/roles/provision_virtual_esxi/tasks/main.yml b/roles/provision_virtual_esxi/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check General Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/roles/provision_vm/tasks/main.yml b/roles/provision_vm/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Manage VM
   community.vmware.vmware_guest:

diff --git a/roles/snapshot_management/tasks/main.yml b/roles/snapshot_management/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Manages virtual machines snapshots in vCenter
   community.vmware.vmware_guest_snapshot:

diff --git a/roles/system_settings/tasks/main.yml b/roles/system_settings/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Configure ntpd
   ansible.builtin.include_tasks: ntpd.yml

diff --git a/roles/vcenter_host_connection/tasks/main.yml b/roles/vcenter_host_connection/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Import Collection Level Vars
   ansible.builtin.include_vars:
-    file: "{{ role_path }}/../vars/main.yml"
+    file: "{{ role_path }}/../../vars/main.yml"
 
 - name: Check General Mandatory Variables Are Defined
   ansible.builtin.assert:

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,9 +1,9 @@
 ---
-vmware_ops_collection_hostname: "{{ vmware_ops_hostname | default(lookup('ansible.builtin.env', 'VMWARE_HOST')) }}"
-vmware_ops_collection_username: "{{ vmware_ops_username | default(lookup('ansible.builtin.env', 'VMWARE_USER')) }}"
-vmware_ops_collection_password: "{{ vmware_ops_password | default(lookup('ansible.builtin.env', 'VMWARE_PASSWORD')) }}"
-vmware_ops_collection_validate_certs: "{{ vmware_ops_validate_certs | default(lookup('ansible.builtin.env', 'VMWARE_VALIDATE_CERTS')) }}"
-vmware_ops_collection_port: "{{ vmware_ops_port | default(lookup('ansible.builtin.env', 'VMWARE_PORT')) }}"
+vmware_ops_collection_hostname: "{{ vmware_ops_hostname | default(lookup('ansible.builtin.env', 'VMWARE_HOST', default=Undefined)) }}"
+vmware_ops_collection_username: "{{ vmware_ops_username | default(lookup('ansible.builtin.env', 'VMWARE_USER', default=Undefined)) }}"
+vmware_ops_collection_password: "{{ vmware_ops_password | default(lookup('ansible.builtin.env', 'VMWARE_PASSWORD', default=Undefined)) }}"
+vmware_ops_collection_validate_certs: "{{ vmware_ops_validate_certs | default(lookup('ansible.builtin.env', 'VMWARE_VALIDATE_CERTS', default=Undefined)) }}"
+vmware_ops_collection_port: "{{ vmware_ops_port | default(lookup('ansible.builtin.env', 'VMWARE_PORT', default=Undefined)) }}"
 
 vmware_ops_collection_proxy_host: "{{ vmware_ops_proxy_host | default(lookup('ansible.builtin.env', 'VMWARE_PROXY_HOST', default=Undefined)) }}"
-vmware_ops_collection_proxy_port: "{{ vmware_ops_proxy_port | default(lookup('ansible.builtin.env', 'VMWARE_PROXY_PORT')) }}"
+vmware_ops_collection_proxy_port: "{{ vmware_ops_proxy_port | default(lookup('ansible.builtin.env', 'VMWARE_PROXY_PORT', default=Undefined)) }}"