Auto-fix usage of modules via FQCN

Since ansible-core 2.10 it is recommended to use modules via FQCN
In order to align with recommendation, we perform migration
by applying suggestions made by `ansible-lint --fix=fqcn`

Change-Id: I73309f9f4a89be3110dea241b319931009bac3f4
This commit is contained in:
Dmitriy Rabotyagov 2025-02-12 15:21:48 +01:00
parent b6966bb57c
commit f796683282
5 changed files with 49 additions and 49 deletions

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: Stop containerd - name: Stop containerd
systemd: ansible.builtin.systemd:
name: "containerd" name: "containerd"
enabled: true enabled: true
state: "stopped" state: "stopped"
@ -26,7 +26,7 @@
listen: "Restart containerd" listen: "Restart containerd"
- name: Start containerd - name: Start containerd
systemd: ansible.builtin.systemd:
name: "containerd" name: "containerd"
enabled: true enabled: true
state: "started" state: "started"
@ -38,7 +38,7 @@
listen: "Restart containerd" listen: "Restart containerd"
- name: Stop docker - name: Stop docker
systemd: ansible.builtin.systemd:
name: "{{ item }}" name: "{{ item }}"
enabled: true enabled: true
state: "stopped" state: "stopped"
@ -53,7 +53,7 @@
listen: "Restart docker" listen: "Restart docker"
- name: Start docker - name: Start docker
systemd: ansible.builtin.systemd:
name: "{{ item }}" name: "{{ item }}"
enabled: true enabled: true
state: "started" state: "started"
@ -68,7 +68,7 @@
listen: "Restart docker" listen: "Restart docker"
- name: Stop services - name: Stop services
systemd: ansible.builtin.systemd:
name: "{{ item.service_name }}" name: "{{ item.service_name }}"
enabled: true enabled: true
state: "stopped" state: "stopped"
@ -85,7 +85,7 @@
- "cert installed" - "cert installed"
- name: Start services - name: Start services
systemd: ansible.builtin.systemd:
name: "{{ item.service_name }}" name: "{{ item.service_name }}"
enabled: true enabled: true
state: "started" state: "started"

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: Gather variables for each operating system - name: Gather variables for each operating system
include_vars: "{{ lookup('first_found', params) }}" ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
vars: vars:
params: params:
files: files:
@ -30,12 +30,12 @@
- always - always
- name: Importing zun_pre_install tasks - name: Importing zun_pre_install tasks
import_tasks: zun_pre_install.yml ansible.builtin.import_tasks: zun_pre_install.yml
tags: tags:
- zun-install - zun-install
- name: Create and install SSL certificates - name: Create and install SSL certificates
include_role: ansible.builtin.include_role:
name: pki name: pki
tasks_from: main_certs.yml tasks_from: main_certs.yml
apply: apply:
@ -60,13 +60,13 @@
# with a source install and wheels built on the repo server. We must # with a source install and wheels built on the repo server. We must
# filter kuryr-lib out of u-c. # filter kuryr-lib out of u-c.
- name: Retrieve the constraints URL - name: Retrieve the constraints URL
uri: ansible.builtin.uri:
url: "{{ zun_upper_constraints_url }}" url: "{{ zun_upper_constraints_url }}"
return_content: true return_content: true
register: _u_c_contents register: _u_c_contents
- name: Install the python venv - name: Install the python venv
import_role: ansible.builtin.import_role:
name: "python_venv_build" name: "python_venv_build"
vars: vars:
venv_python_executable: "{{ zun_venv_python_executable }}" venv_python_executable: "{{ zun_venv_python_executable }}"
@ -83,7 +83,7 @@
- zun-install - zun-install
- name: Including osa.mq_setup role - name: Including osa.mq_setup role
include_role: ansible.builtin.include_role:
name: openstack.osa.mq_setup name: openstack.osa.mq_setup
apply: apply:
tags: tags:
@ -110,7 +110,7 @@
- always - always
- name: Including osa.db_setup role - name: Including osa.db_setup role
include_role: ansible.builtin.include_role:
name: openstack.osa.db_setup name: openstack.osa.db_setup
apply: apply:
tags: tags:
@ -132,7 +132,7 @@
- always - always
- name: Including osa.service_setup role - name: Including osa.service_setup role
include_role: ansible.builtin.include_role:
name: openstack.osa.service_setup name: openstack.osa.service_setup
apply: apply:
tags: tags:
@ -172,20 +172,20 @@
- always - always
- name: Importing zun_post_install tasks - name: Importing zun_post_install tasks
import_tasks: zun_compute.yml ansible.builtin.import_tasks: zun_compute.yml
when: when:
- "zun_services['zun-compute']['group'] in group_names" - "zun_services['zun-compute']['group'] in group_names"
tags: tags:
- zun-compute - zun-compute
- name: Importing zun_post_install tasks - name: Importing zun_post_install tasks
import_tasks: zun_post_install.yml ansible.builtin.import_tasks: zun_post_install.yml
tags: tags:
- zun-config - zun-config
- post-install - post-install
- name: Import uwsgi role - name: Import uwsgi role
import_role: ansible.builtin.import_role:
name: uwsgi name: uwsgi
vars: vars:
uwsgi_services: "{{ uwsgi_zun_services }}" uwsgi_services: "{{ uwsgi_zun_services }}"
@ -195,7 +195,7 @@
- uwsgi - uwsgi
- name: Run the systemd service role - name: Run the systemd service role
import_role: ansible.builtin.import_role:
name: systemd_service name: systemd_service
vars: vars:
systemd_user_name: "{{ zun_system_user_name }}" systemd_user_name: "{{ zun_system_user_name }}"

View File

@ -16,7 +16,7 @@
- name: Run apt install block - name: Run apt install block
block: block:
- name: Run the apt package pinning role - name: Run the apt package pinning role
include_role: ansible.builtin.include_role:
name: apt_package_pinning name: apt_package_pinning
vars: vars:
apt_package_pinning_file_name: "docker.pref" apt_package_pinning_file_name: "docker.pref"
@ -41,13 +41,13 @@
# NOTE(jrosser) remove this task for the 2025.2 release # NOTE(jrosser) remove this task for the 2025.2 release
- name: Clean up legacy repository config not in deb822 format - name: Clean up legacy repository config not in deb822 format
file: ansible.builtin.file:
path: "/etc/apt/sources.list.d/docker-ce.list" path: "/etc/apt/sources.list.d/docker-ce.list"
state: absent state: absent
register: _cleanup_apt_repositories register: _cleanup_apt_repositories
- name: Ensure python3-debian package is available - name: Ensure python3-debian package is available
apt: ansible.builtin.apt:
name: python3-debian name: python3-debian
- name: Manage apt repositories - name: Manage apt repositories
@ -78,7 +78,7 @@
register: add_nv_repos register: add_nv_repos
- name: Update Apt cache - name: Update Apt cache
apt: ansible.builtin.apt:
update_cache: true update_cache: true
when: (add_nv_repos is changed) or (_cleanup_apt_repositories is changed) when: (add_nv_repos is changed) or (_cleanup_apt_repositories is changed)
register: update_apt_cache register: update_apt_cache
@ -90,7 +90,7 @@
- "ansible_facts['pkg_mgr'] == 'apt'" - "ansible_facts['pkg_mgr'] == 'apt'"
- name: Add docker repo - name: Add docker repo
yum_repository: ansible.builtin.yum_repository:
name: "{{ item.name }}" name: "{{ item.name }}"
description: "{{ item.description }}" description: "{{ item.description }}"
baseurl: "{{ item.repo }}" baseurl: "{{ item.repo }}"
@ -107,7 +107,7 @@
- ansible_facts['pkg_mgr'] == 'dnf' - ansible_facts['pkg_mgr'] == 'dnf'
- name: Enable module_hotfixes - name: Enable module_hotfixes
lineinfile: ansible.builtin.lineinfile:
dest: "/etc/yum.repos.d/{{ item.name }}.repo" dest: "/etc/yum.repos.d/{{ item.name }}.repo"
line: "module_hotfixes=1" line: "module_hotfixes=1"
regexp: "^module_hotfixes" regexp: "^module_hotfixes"
@ -117,7 +117,7 @@
- ansible_facts['os_family'] | lower == 'redhat' - ansible_facts['os_family'] | lower == 'redhat'
- name: Install compute distro packages - name: Install compute distro packages
package: ansible.builtin.package:
name: "{{ zun_distro_compute_packages }}" name: "{{ zun_distro_compute_packages }}"
state: "{{ zun_package_state }}" state: "{{ zun_package_state }}"
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}" update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
@ -128,7 +128,7 @@
when: zun_kata_enabled | bool when: zun_kata_enabled | bool
block: block:
- name: Download kata package - name: Download kata package
get_url: ansible.builtin.get_url:
url: "{{ zun_kata_package_source }}" url: "{{ zun_kata_package_source }}"
dest: "/opt/{{ zun_kata_package_source | basename }}" dest: "/opt/{{ zun_kata_package_source | basename }}"
mode: "0440" mode: "0440"
@ -136,7 +136,7 @@
register: _kata_downloaded register: _kata_downloaded
- name: Unpack package - name: Unpack package
unarchive: ansible.builtin.unarchive:
src: "/opt/{{ zun_kata_package_source | basename }}" src: "/opt/{{ zun_kata_package_source | basename }}"
dest: /opt/ dest: /opt/
remote_src: true remote_src: true
@ -149,7 +149,7 @@
- Restart containerd - Restart containerd
- name: Symlink kata binaries to PATH - name: Symlink kata binaries to PATH
file: ansible.builtin.file:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
state: link state: link
@ -162,7 +162,7 @@
dest: /usr/local/bin/kata-runtime dest: /usr/local/bin/kata-runtime
- name: Ensure the containerd config directory exists - name: Ensure the containerd config directory exists
file: ansible.builtin.file:
path: "/etc/containerd" path: "/etc/containerd"
state: "directory" state: "directory"
owner: "root" owner: "root"
@ -170,7 +170,7 @@
mode: "0755" mode: "0755"
- name: Configure containerd - name: Configure containerd
template: ansible.builtin.template:
src: "config.toml.j2" src: "config.toml.j2"
dest: "/etc/containerd/config.toml" dest: "/etc/containerd/config.toml"
mode: "0644" mode: "0644"
@ -180,7 +180,7 @@
- Restart containerd - Restart containerd
- name: Ensure the Docker config directory exists - name: Ensure the Docker config directory exists
file: ansible.builtin.file:
path: "/etc/docker" path: "/etc/docker"
state: "directory" state: "directory"
owner: "root" owner: "root"
@ -204,7 +204,7 @@
- Restart docker - Restart docker
- name: Create the kuryr system group - name: Create the kuryr system group
group: ansible.builtin.group:
name: "{{ zun_kuryr_system_group_name }}" name: "{{ zun_kuryr_system_group_name }}"
gid: "{{ zun_kuryr_system_group_gid | default(omit) }}" gid: "{{ zun_kuryr_system_group_gid | default(omit) }}"
state: "present" state: "present"
@ -213,7 +213,7 @@
- zun-kuryr-group - zun-kuryr-group
- name: Create the kuryr system user - name: Create the kuryr system user
user: ansible.builtin.user:
name: "{{ zun_kuryr_system_user_name }}" name: "{{ zun_kuryr_system_user_name }}"
uid: "{{ zun_kuryr_system_user_uid | default(omit) }}" uid: "{{ zun_kuryr_system_user_uid | default(omit) }}"
group: "{{ zun_kuryr_system_group_name }}" group: "{{ zun_kuryr_system_group_name }}"
@ -227,7 +227,7 @@
- zun-kuryr-user - zun-kuryr-user
- name: Create kuryr dir - name: Create kuryr dir
file: ansible.builtin.file:
path: "{{ item.path }}" path: "{{ item.path }}"
state: directory state: directory
owner: "{{ item.owner | default('root') }}" owner: "{{ item.owner | default('root') }}"
@ -279,14 +279,14 @@
- Restart docker - Restart docker
- name: Ensure docker users are added to the docker group - name: Ensure docker users are added to the docker group
user: ansible.builtin.user:
name: "{{ item }}" name: "{{ item }}"
groups: "{{ zun_docker_groupname }}" groups: "{{ zun_docker_groupname }}"
append: true append: true
with_items: "{{ zun_docker_users }}" with_items: "{{ zun_docker_users }}"
- name: Drop sudoers file - name: Drop sudoers file
template: ansible.builtin.template:
src: "sudoers.j2" src: "sudoers.j2"
dest: "/etc/sudoers.d/{{ zun_system_user_name }}_sudoers" dest: "/etc/sudoers.d/{{ zun_system_user_name }}_sudoers"
mode: "0440" mode: "0440"
@ -297,19 +297,19 @@
- zun-sudoers - zun-sudoers
- name: Configure multipathd (RedHat only) - name: Configure multipathd (RedHat only)
command: ansible.builtin.command:
cmd: "/sbin/mpathconf --enable" cmd: "/sbin/mpathconf --enable"
creates: "/etc/multipath.conf" creates: "/etc/multipath.conf"
when: ansible_facts['os_family'] == "RedHat" when: ansible_facts['os_family'] == "RedHat"
- name: Enable multipathd service - name: Enable multipathd service
systemd: ansible.builtin.systemd:
name: multipathd name: multipathd
state: started state: started
enabled: true enabled: true
- name: Create script to clean up old Docker data - name: Create script to clean up old Docker data
template: ansible.builtin.template:
src: "zun-docker-cleanup.j2" src: "zun-docker-cleanup.j2"
dest: "{{ zun_bin }}/zun-docker-cleanup" dest: "{{ zun_bin }}/zun-docker-cleanup"
owner: "root" owner: "root"
@ -317,12 +317,12 @@
mode: "0755" mode: "0755"
- name: Set state for timed data cleanup - name: Set state for timed data cleanup
file: ansible.builtin.file:
path: "/var/tmp/zun-docker-cleanup.disabled" path: "/var/tmp/zun-docker-cleanup.disabled"
state: "{{ zun_docker_prune_images | ternary('absent', 'touch') }}" state: "{{ zun_docker_prune_images | ternary('absent', 'touch') }}"
mode: "0644" mode: "0644"
- name: Remove legacy systemd docker override - name: Remove legacy systemd docker override
file: ansible.builtin.file:
path: "/etc/systemd/system/docker.service.d/zun-docker.conf" path: "/etc/systemd/system/docker.service.d/zun-docker.conf"
state: absent state: absent

View File

@ -16,7 +16,7 @@
- name: Define the docker api - name: Define the docker api
block: block:
- name: Get docker api version - name: Get docker api version
command: >- ansible.builtin.command: >-
{% raw %} {% raw %}
docker version -f "{{ .Client.APIVersion }}" docker version -f "{{ .Client.APIVersion }}"
{% endraw %} {% endraw %}
@ -25,7 +25,7 @@
register: docker_version register: docker_version
- name: Set docker api version fact - name: Set docker api version fact
set_fact: ansible.builtin.set_fact:
zun_docker_api_version: "{{ docker_version.stdout | trim }}" zun_docker_api_version: "{{ docker_version.stdout | trim }}"
when: when:
- zun_services['zun-compute']['group'] in group_names - zun_services['zun-compute']['group'] in group_names
@ -70,7 +70,7 @@
- zun-policy-override - zun-policy-override
- name: Remove legacy policy.yaml file - name: Remove legacy policy.yaml file
file: ansible.builtin.file:
path: "/etc/zun/policy.yaml" path: "/etc/zun/policy.yaml"
state: absent state: absent
when: when:
@ -79,7 +79,7 @@
- zun-policy-override - zun-policy-override
- name: Synchronize the zun DB schema - name: Synchronize the zun DB schema
command: "{{ zun_bin }}/zun-db-manage --config-dir /etc/zun upgrade" ansible.builtin.command: "{{ zun_bin }}/zun-db-manage --config-dir /etc/zun upgrade"
become: true become: true
become_user: "{{ zun_system_user_name }}" become_user: "{{ zun_system_user_name }}"
changed_when: false changed_when: false

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: Create the system group - name: Create the system group
group: ansible.builtin.group:
name: "{{ zun_system_group_name }}" name: "{{ zun_system_group_name }}"
gid: "{{ zun_system_group_gid | default(omit) }}" gid: "{{ zun_system_group_gid | default(omit) }}"
state: "present" state: "present"
@ -23,7 +23,7 @@
- zun-group - zun-group
- name: Create the zun system user - name: Create the zun system user
user: ansible.builtin.user:
name: "{{ zun_system_user_name }}" name: "{{ zun_system_user_name }}"
uid: "{{ zun_system_user_uid | default(omit) }}" uid: "{{ zun_system_user_uid | default(omit) }}"
group: "{{ zun_system_group_name }}" group: "{{ zun_system_group_name }}"
@ -36,7 +36,7 @@
- zun-user - zun-user
- name: Create zun dir - name: Create zun dir
file: ansible.builtin.file:
path: "{{ item.path }}" path: "{{ item.path }}"
state: directory state: directory
owner: "{{ item.owner | default(zun_system_user_name) }}" owner: "{{ item.owner | default(zun_system_user_name) }}"
@ -57,7 +57,7 @@
- zun-dirs - zun-dirs
- name: Drop sudoers file - name: Drop sudoers file
template: ansible.builtin.template:
src: "sudoers.j2" src: "sudoers.j2"
dest: "/etc/sudoers.d/{{ zun_system_user_name }}_sudoers" dest: "/etc/sudoers.d/{{ zun_system_user_name }}_sudoers"
mode: "0440" mode: "0440"