Skip to content

Commit

Permalink
Support ansible 2.14 (#627)
Browse files Browse the repository at this point in the history
- Remove the 'warn:' argument

See also: ansible/ansible#77411 .

- CI: Ignore command-instead-of-module

Signed-off-by: Yedidyah Bar David <didi@redhat.com>

Signed-off-by: Yedidyah Bar David <didi@redhat.com>
  • Loading branch information
didib authored Nov 16, 2022
1 parent b035965 commit 8dacca4
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 17 deletions.
1 change: 1 addition & 0 deletions .config/ansible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ warn_list:
- fqcn[action]
- name[missing]
- deprecated-module
- command-instead-of-module
3 changes: 3 additions & 0 deletions changelogs/fragments/627-remove-warn-arg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- Remove the 'warn:' argument (https://github.com/oVirt/ovirt-ansible-collection/pull/627).
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
delay: 10
until: ovf_store_content.rc == 0
with_items: "{{ ovf_store_disks }}"
args:
warn: false
- name: Prepare images
ansible.builtin.command: >-
vdsm-client Image prepare storagepoolID={{ datacenter_id }}
Expand Down Expand Up @@ -136,7 +134,6 @@
environment: "{{ he_cmd_lang }}"
args:
chdir: "{{ he_local_vm_dir }}"
warn: false
become: true
become_user: vdsm
become_method: sudo
Expand Down Expand Up @@ -195,8 +192,6 @@
become_user: vdsm
become_method: sudo
changed_when: true
args:
warn: false
- name: Initialize metadata volume
# Data is written at offset 4KiB*host_id and since ovirt supports 250 hosts per dc,
# we can have maximum 250*4KiB = ~ 1MiB
Expand Down
6 changes: 0 additions & 6 deletions roles/hosted_engine_setup/tasks/initial_clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
'/## beginning of configuration section by
vdsm-4.[0-9]\+.[0-9]\+/,/## end of configuration section by vdsm-4.[0-9]\+.[0-9]\+/d' {{ item }} || :
environment: "{{ he_cmd_lang }}"
args:
warn: false
with_items:
- /etc/libvirt/libvirtd.conf
- /etc/libvirt/qemu.conf
Expand All @@ -26,8 +24,6 @@
sed -i
'/## beginning of configuration section for VNC encryption/,/##
end of configuration section for VNC encryption\+/d' /etc/libvirt/qemu.conf
args:
warn: false
environment: "{{ he_cmd_lang }}"
changed_when: true
- name: Check if vdsm's abrt-action-save-package-data config exists
Expand Down Expand Up @@ -87,8 +83,6 @@
ansible.builtin.command: >-
sed -i '/## start vdsm-4.[0-9]\+.[0-9]\+ configuration/,/## end vdsm configuration/d' /etc/sasl2/libvirt.conf
environment: "{{ he_cmd_lang }}"
args:
warn: false
tags: ['skip_ansible_lint']
- name: Stop and disable services
ansible.builtin.service:
Expand Down
2 changes: 0 additions & 2 deletions roles/repositories/tasks/rh-subscription.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@

- name: Enable dnf modules
ansible.builtin.command: "dnf module enable -y {{ ovirt_repositories_rh_dnf_modules | join(' ') }}"
args:
warn: false
when:
- ovirt_repositories_ovirt_version|string >= '4.4'
- ovirt_repositories_target_host == 'engine'
Expand Down
2 changes: 0 additions & 2 deletions roles/repositories/tasks/rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

- name: Enable dnf modules
ansible.builtin.command: "dnf module enable -y {{ ovirt_repositories_ovirt_dnf_modules | join(' ') }}"
args:
warn: false
when:
- ovirt_repositories_ovirt_version|string >= '4.4'
- ovirt_repositories_target_host == 'engine'
2 changes: 0 additions & 2 deletions roles/repositories/tasks/satellite-subscription.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

- name: Enable dnf modules
ansible.builtin.command: "dnf module enable -y {{ ovirt_repositories_rh_dnf_modules | join(' ') }}"
args:
warn: false
when:
- ovirt_repositories_ovirt_version|string >= '4.4'
- ovirt_repositories_target_host == 'engine'
Expand Down

0 comments on commit 8dacca4

Please sign in to comment.