diff --git a/roles/vm_collect/tasks/main.yml b/roles/vm_collect/tasks/main.yml index bf8b45f..0a3dfcb 100644 --- a/roles/vm_collect/tasks/main.yml +++ b/roles/vm_collect/tasks/main.yml @@ -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) }}" @@ -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 diff --git a/roles/vm_hot_plug/templates/compute_patch.yml.j2 b/roles/vm_hot_plug/templates/compute_patch.yml.j2 index bcc24ec..5015fc7 100644 --- a/roles/vm_hot_plug/templates/compute_patch.yml.j2 +++ b/roles/vm_hot_plug/templates/compute_patch.yml.j2 @@ -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'] }}