Skip to content

fix(vm_collect,vm_hot_plug): fix label selector and memory bugs #8

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

Merged
sabre1041 merged 7 commits into from
May 5, 2026
Merged

fix(vm_collect,vm_hot_plug): fix label selector and memory bugs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
999a9e1
fix(vm_collect, vm_hot_plug): fix copy-paste bugs breaking label sele…
stevefulme1 Apr 15, 2026
3eca18a
fix: add missing allowlist_externals for tox-ansible environments
stevefulme1 May 2, 2026
86646f4
fix: let tox-ansible manage test commands instead of overriding
stevefulme1 May 2, 2026
68401a9
fix: add distlib to testenv deps for galaxy/sanity manifest support
stevefulme1 May 2, 2026
d92e006
fix: remove testenv overrides — only set allowlist_externals, let tox…
stevefulme1 May 2, 2026
8c2e177
fix: add distlib to galaxy tox env for manifest support
stevefulme1 May 2, 2026
1942a6e
fix: restore original testenv config, only add allowlist_externals
stevefulme1 May 4, 2026
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
4 changes: 2 additions & 2 deletions roles/vm_collect/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
- "(lookup('ansible.builtin.vars', vm_collect_vms_var, default=[]) | map(attribute='response_obj') | list) | selectattr('metadata.namespace', 'equalto', vm_collect_no_label_selectors_response.metadata.namespace) | list | selectattr('metadata.name', 'equalto', vm_collect_no_label_selectors_response.metadata.name) | list | length == 0" # noqa: yaml[line-length]
- "('namespace' in vm_collect_request_instance and 'names' in vm_collect_request_instance and vm_collect_no_label_selectors_response.metadata.name in vm_collect_request_instance['names']) or ('namespace' in vm_collect_request_instance and 'names' not in vm_collect_request_instance) or ('namespace' not in vm_collect_request_instance)" # noqa: yaml[line-length]

- name: "Query Using Label Selector - {{ vm_backup_restore_collect_obj | default(collect_obj_default_kind) }}"
- name: "Query Using Label Selector - {{ vm_collect_obj | default(vm_collect_obj_default_kind) }}"
when: "'label_selectors' in vm_collect_request_instance"
block:
- name: "Query (With Label Selector) - {{ vm_collect_obj | default(vm_collect_obj_default_kind) }}"
Expand All @@ -61,7 +61,7 @@

- name: "Add (With Label Selector) - {{ vm_collect_obj | default(vm_collect_obj_default_kind) }}"
ansible.builtin.set_fact:
"{{ vm_collect_vms_var }}": "{{ lookup('ansible.builtin.vars', vm_collect_vms_var, default=[]) + [{'response_obj': vm_collect_no_label_selectors_response} | ansible.builtin.combine(vm_collect_request_instance, recursive=True)] }}" # noqa: var-naming[no-jinja] # noqa: yaml[line-length]
"{{ vm_collect_vms_var }}": "{{ lookup('ansible.builtin.vars', vm_collect_vms_var, default=[]) + [{'response_obj': vm_collect_label_selectors_response} | ansible.builtin.combine(vm_collect_request_instance, recursive=True)] }}" # noqa: var-naming[no-jinja] # noqa: yaml[line-length]
loop: "{{ vm_collect_label_selectors_responses['resources'] if 'resources' in vm_collect_label_selectors_responses else [] }}" # noqa: yaml[line-length]
loop_control:
loop_var: vm_collect_label_selectors_response
Expand Down
2 changes: 1 addition & 1 deletion roles/vm_hot_plug/templates/compute_patch.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
path: /spec/template/spec/domain/cpu
value: {{ vm_hot_plug_vm.response_obj.spec.template.spec.domain.cpu | ansible.builtin.combine((vm_hot_plug_compute['cpu']), recursive=true) | from_yaml }}
{% endif %}
{% if 'cpu' in vm_hot_plug_compute and vm_hot_plug_compute['cpu'] is not none %}
{% if 'memory' in vm_hot_plug_compute and vm_hot_plug_compute['memory'] is not none %}
- op: replace
path: /spec/template/spec/domain/memory/guest
value: {{ vm_hot_plug_compute['memory'] }}
Expand Down
Loading