Skip to content

Fix storage map accumulation and optimize datastore filtering #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertoflorez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix storage map accumulation and optimize datastore filtering #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 47 additions & 3 deletions roles/mtv_management/tasks/_mtv_storage_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- name: _mtv_storage_map | Initialize data structures
ansible.builtin.set_fact:
mtv_management_mtv_storagemaps: {}
mtv_management_mtv_storagemap_maps: {}

- name: _mtv_storage_map | Verify Storage Map Overrides do not contain both includes and excludes
ansible.builtin.fail:
Expand Down Expand Up @@ -41,9 +41,46 @@
mtv_management_inventory_query_result_var: mtv_destination_datastores
when: "'vsphere' in provider"

- name: _mtv_storage_map | Extract included datastore IDs from overrides
ansible.builtin.set_fact:
mtv_management_mtv_allowed_datastore_ids: >-
{{
mtv_management_storage_map_overrides
| selectattr('include', 'defined')
| selectattr('include', 'equalto', true)
| map(attribute='id')
| list
}}
when:
- mtv_management_storage_map_overrides is defined
- mtv_management_storage_map_overrides | length > 0
- mtv_management_storage_map_overrides | selectattr('include', 'defined') | list | length > 0

- name: _mtv_storage_map | Extract excluded datastore IDs from overrides
ansible.builtin.set_fact:
mtv_management_mtv_excluded_datastore_ids: >-
{{
mtv_management_storage_map_overrides
| selectattr('exclude', 'defined')
| selectattr('exclude', 'equalto', true)
| map(attribute='id')
| list
}}
when:
- mtv_management_storage_map_overrides is defined
- mtv_management_storage_map_overrides | length > 0
- mtv_management_storage_map_overrides | selectattr('exclude', 'defined') | list | length > 0

- name: _mtv_storage_map | Process VMware Datastores
ansible.builtin.include_tasks: _mtv_storage_map_process_datastore.yml
loop: "{{ mtv_destination_datastores }}"
loop: >-
{{
(mtv_destination_datastores | selectattr('id', 'in', mtv_management_mtv_allowed_datastore_ids) | list)
if (mtv_management_mtv_allowed_datastore_ids | default([]) | length > 0)
else (mtv_destination_datastores | rejectattr('id', 'in', mtv_management_mtv_excluded_datastore_ids | default([])) | list)
if (mtv_management_mtv_excluded_datastore_ids | default([]) | length > 0)
else mtv_destination_datastores
}}
loop_control:
loop_var: mtv_vmware_datastore
when:
Expand All @@ -53,7 +90,14 @@

- name: _mtv_storage_map | Process Ovirt Datastores
ansible.builtin.include_tasks: _mtv_storage_map_process_datastore.yml
loop: "{{ mtv_destination_datastores }}"
loop: >-
{{
(mtv_destination_datastores | selectattr('id', 'in', mtv_management_mtv_allowed_datastore_ids) | list)
if (mtv_management_mtv_allowed_datastore_ids | default([]) | length > 0)
else (mtv_destination_datastores | rejectattr('id', 'in', mtv_management_mtv_excluded_datastore_ids | default([])) | list)
if (mtv_management_mtv_excluded_datastore_ids | default([]) | length > 0)
else mtv_destination_datastores
}}
loop_control:
loop_var: mtv_ovirt_datastore
when:
Expand Down
6 changes: 2 additions & 4 deletions roles/mtv_management/tasks/_mtv_storage_map_process_datastore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,13 @@

- name: _mtv_storage_map_process_datastore | Add VMware StorageMap Map to Dict
ansible.builtin.set_fact:
mtv_management_mtv_storagemap_maps: "{{ mtv_management_mtv_storagemap_maps | default({}) | ansible.builtin.combine({mtv_vmware_datastore.selfLink: mtv_management_storage_map_map}, recursive=true) }}" # noqa: yaml[line-length]
mtv_management_mtv_storagemap_maps: "{{ mtv_management_mtv_storagemap_maps | default({}) | ansible.builtin.combine({(mtv_vmware_datastore.selfLink + '-' + _mtv_management_storage_map_storage_class): mtv_management_storage_map_map}, recursive=true) }}" # noqa: yaml[line-length]
when:
- mtv_vmware_datastore is defined
- "(('include' in mtv_management_mtv_vmware_datastore_overrides and mtv_management_storage_map_overrides | selectattr('include', 'defined') | list | length > 0) or (mtv_management_storage_map_overrides | selectattr('include', 'defined') | list | length == 0 and mtv_management_storage_map_overrides | selectattr('exclude', 'defined') | list | length == 0)) or ('exclude' not in mtv_management_mtv_vmware_datastore_overrides and mtv_management_storage_map_overrides | selectattr('exclude', 'defined') | list | length > 0)" # noqa: yaml[line-length]

- name: _mtv_storage_map_process_datastore | Add Ovirt StorageMap Map to Dict
ansible.builtin.set_fact:
mtv_management_mtv_storagemap_maps: "{{ mtv_management_mtv_storagemap_maps | default({}) | ansible.builtin.combine({mtv_ovirt_datastore.selfLink: mtv_management_storage_map_map}, recursive=true) }}" # noqa: yaml[line-length]
mtv_management_mtv_storagemap_maps: "{{ mtv_management_mtv_storagemap_maps | default({}) | ansible.builtin.combine({(mtv_ovirt_datastore.selfLink + '-' + _mtv_management_storage_map_storage_class): mtv_management_storage_map_map}, recursive=true) }}" # noqa: yaml[line-length]
when:
- mtv_ovirt_datastore is defined
- "(('include' in mtv_management_mtv_ovirt_datastore_overrides and mtv_management_storage_map_overrides | selectattr('include', 'defined') | list | length > 0) or (mtv_management_storage_map_overrides | selectattr('include', 'defined') | list | length == 0 and mtv_management_storage_map_overrides | selectattr('exclude', 'defined') | list | length == 0)) or ('exclude' not in mtv_management_mtv_ovirt_datastore_overrides and mtv_management_storage_map_overrides | selectattr('exclude', 'defined') | list | length > 0)" # noqa: yaml[line-length]
...
Loading