Skip to content
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

Jump to bottom

CI: Fix ansible-test errors: Change include to include_tasks #735

Merged
merged 1 commit into from
Dec 12, 2023
Merged

CI: Fix ansible-test errors: Change include to include_tasks #735

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
3 changes: 3 additions & 0 deletions changelogs/fragments/733-roles-fix-ansible-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- roles - Fix ansible-test errors change include to include_tasks (https://github.com/oVirt/ovirt-ansible-collection/pull/733).
2 changes: 1 addition & 1 deletion roles/disaster_recovery/tasks/recover/register_templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
register: storage_template_info

- name: Register unregistered templates
include: register_template.yml
include_tasks: register_template.yml
# The main task is already declared to ignore errors so that might be
# redundant to put it here ignore_errors: "{{ ignore | default(yes) }}"
with_items: "{{ storage_template_info.ovirt_storage_templates }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/disaster_recovery/tasks/recover/register_vms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# TODO: We should filter out VMs which already exist in the setup (diskless VMs)
- name: Register VMs
include: register_vm.yml
include_tasks: register_vm.yml
with_items: "{{ storage_vm_info.ovirt_storage_vms }}"
# We use loop_control so storage.name will not be overridden by the nested loop.
loop_control:
Expand Down
16 changes: 8 additions & 8 deletions roles/infra/roles/datacenter_cleanup/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
- name: Remove VMPools
include: vm_pools.yml
include_tasks: vm_pools.yml

- name: Remove VMs
include: vms.yml
include_tasks: vms.yml

- name: Remove Templates
include: templates.yml
include_tasks: templates.yml

- name: Remove Disks
include: disks.yml
include_tasks: disks.yml

- name: Find existing Storage Domains in Datacenter
ovirt_storage_domain_info:
Expand All @@ -18,7 +18,7 @@
register: sd_info

- name: Remove all Storage Domains except master
include: storages_pre.yml
include_tasks: storages_pre.yml

- name: Find existing clusters in Datacenter
ovirt_cluster_info:
Expand All @@ -27,13 +27,13 @@
register: cluster_info

- name: Remove Datacenter
include: datacenter.yml
include_tasks: datacenter.yml

- name: Remove master Storage Domain
include: storages_last.yml
include_tasks: storages_last.yml

- name: Remove Clusters and Hosts
include: cluster_and_hosts.yml
include_tasks: cluster_and_hosts.yml
with_items: "{{ cluster_info.ovirt_clusters }}"
loop_control:
loop_var: cluster_item
Loading