6 files changed, 27 insertions, 27 deletions
diff --git a/roles/cephadm/tasks/main.yml b/roles/cephadm/tasks/main.yml
index 5abf30a38..b0a7180ed 100644
--- a/roles/cephadm/tasks/main.yml
+++ b/roles/cephadm/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
 - name: Include package installation
-  include_tasks: pkg_{{ ansible_os_family | lower }}.yml
+  ansible.builtin.include_tasks: pkg_{{ ansible_os_family | lower }}.yml
 
 - name: Ensure /etc/ceph exists
-  file:
+  ansible.builtin.file:
     path: /etc/ceph
     state: directory
     mode: "0755"
   become: true
 
 - name: Generate ssh key for cephadm
-  openssh_keypair:
+  community.crypto.openssh_keypair:
     path: "/etc/ceph/cephadm.id"
     mode: "0600"
     size: 4096
@@ -19,14 +19,14 @@
   register: cephadm_ssh_key
 
 - name: Save public key
-  copy:
+  ansible.builtin.copy:
     content: "{{ cephadm_ssh_key.public_key }}"
     dest: /etc/ceph/cephadm.pub
     mode: "0644"
   become: true
 
 - name: Copy cephadm public key to all hosts
-  authorized_key:
+  ansible.posix.authorized_key:
     user: root
     state: present
     key: "{{ cephadm_ssh_key.public_key }}"
@@ -38,7 +38,7 @@
 - name: Bootstrap cephadm
   vars:
     mon_ip: "{{ hostvars[inventory_hostname]['ansible_' + api_interface_name | replace('-', '_')].ipv4.address }}"
-  command:
+  ansible.builtin.command:
     cmd: >
          cephadm
          --docker
@@ -57,25 +57,25 @@
 - name: Get ceph fsid
   vars:
     regexp: 'Cluster fsid: (.*)'
-  set_fact:
+  ansible.builtin.set_fact:
     ceph_fsid: "{{ cephadm_bootstrap_output.stdout | regex_search(regexp, '\\1') | first }}"
 
 - name: Template out cluster spec
-  template:
+  ansible.builtin.template:
     src: templates/cephadm.yml.j2
     dest: "/var/run/ceph/{{ ceph_fsid }}/cluster.yml"
     mode: "0600"
   become: true
 
 - name: Template out command spec
-  template:
+  ansible.builtin.template:
     src: templates/commands.sh.j2
     dest: "/var/run/ceph/{{ ceph_fsid }}/commands.sh"
     mode: "0600"
   become: true
 
 - name: Run commands
-  command:
+  ansible.builtin.command:
     cmd: >
          cephadm shell --
          bash -x /var/run/ceph/commands.sh
@@ -96,7 +96,7 @@
       [global]
       fsid = {{ ceph_fsid }}
       mon_host = {{ _mon_host | join(", ") }}
-  copy:
+  ansible.builtin.copy:
     content: "{{ ceph_conf_fixed }}"
     dest: "/etc/ceph/ceph.conf.fixed"
     mode: "0644"
diff --git a/roles/cephadm/tasks/pkg_debian.yml b/roles/cephadm/tasks/pkg_debian.yml
index 92dd08221..be81322b7 100644
--- a/roles/cephadm/tasks/pkg_debian.yml
+++ b/roles/cephadm/tasks/pkg_debian.yml
@@ -1,21 +1,21 @@
 ---
 - name: Ensure apt sources list directory exists
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/apt/sources.list.d
     state: directory
     recurse: true
 
 - name: Enable Ceph apt repository
   become: true
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: "{{ cephadm_ceph_apt_repo }}"
     filename: ceph
   when: not cephadm_use_package_from_distribution | bool
 
 - name: Install cephadm
   become: true
-  apt:
+  ansible.builtin.apt:
     name:
       - cephadm
       - python3-jinja2
diff --git a/roles/cephadm/tasks/pkg_redhat.yml b/roles/cephadm/tasks/pkg_redhat.yml
index 9f679c9f1..459370a43 100644
--- a/roles/cephadm/tasks/pkg_redhat.yml
+++ b/roles/cephadm/tasks/pkg_redhat.yml
@@ -1,20 +1,20 @@
 ---
 - name: Ensure yum repos directory exists
   become: true
-  file:
+  ansible.builtin.file:
     path: /etc/yum.repos.d/
     state: directory
     recurse: true
 
 - name: Install centos-release-ceph
   become: true
-  dnf:
+  ansible.builtin.dnf:
     name: "centos-release-ceph-{{ cephadm_ceph_release }}"
   when: cephadm_use_package_from_distribution
 
 - name: Enable Ceph base yum repository
   become: true
-  yum_repository:
+  ansible.builtin.yum_repository:
     name: "{{ item.shortname }}"
     description: "{{ item.name }}"
     baseurl: "{{ item.url }}"
@@ -25,7 +25,7 @@
 # NOTE(mnasiadka): cephadm bootstrap failing on jinja2 missing
 - name: Install cephadm and jinja2
   become: true
-  dnf:
+  ansible.builtin.dnf:
     name:
       - cephadm
       - python3-jinja2
diff --git a/roles/kolla-ansible-deploy/tasks/main.yml b/roles/kolla-ansible-deploy/tasks/main.yml
index b2ec759cc..6f9f48e52 100644
--- a/roles/kolla-ansible-deploy/tasks/main.yml
+++ b/roles/kolla-ansible-deploy/tasks/main.yml
@@ -8,7 +8,7 @@
     recurse: true
 
 - name: Import certificates.yml
-  import_tasks: certificates.yml
+  ansible.builtin.import_tasks: certificates.yml
 
 - name: Import deploy.yml
-  import_tasks: deploy.yml
+  ansible.builtin.import_tasks: deploy.yml
diff --git a/roles/multi-node-managed-addressing/tasks/main.yml b/roles/multi-node-managed-addressing/tasks/main.yml
index 925468b8b..0949746bb 100644
--- a/roles/multi-node-managed-addressing/tasks/main.yml
+++ b/roles/multi-node-managed-addressing/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # Not all variables have sensible defaults, let's ensure these are set.
 - name: Ensure mandatory variables are defined
-  assert:
+  ansible.builtin.assert:
     that:
       - managed_interface_name is defined
       - managed_network_prefix is defined
@@ -9,7 +9,7 @@
       - managed_network_address_family is defined
 
 - name: Set managed interface facts
-  set_fact:
+  ansible.builtin.set_fact:
     managed_interface_address: "{{ managed_network_prefix }}{{ groups['all'].index(inventory_hostname) + 1 }}"
 
 - name: Add IPv4 address for managed network
@@ -36,7 +36,7 @@
 
 - name: Accept traffic on the managed network (IN)
   become: true
-  iptables:
+  ansible.builtin.iptables:
     state: present
     action: insert
     chain: INPUT
@@ -47,7 +47,7 @@
 # NOTE(yoctozepto): the default policy is ACCEPT but it is nicer to get statistics
 - name: Accept traffic on the managed network (OUT)
   become: true
-  iptables:
+  ansible.builtin.iptables:
     state: present
     action: insert
     chain: OUTPUT
diff --git a/roles/multi-node-vxlan-overlay/tasks/main.yml b/roles/multi-node-vxlan-overlay/tasks/main.yml
index 27ae67bab..9855df21e 100644
--- a/roles/multi-node-vxlan-overlay/tasks/main.yml
+++ b/roles/multi-node-vxlan-overlay/tasks/main.yml
@@ -1,20 +1,20 @@
 ---
 # Not all variables have sensible defaults, let's ensure these are set.
 - name: Ensure mandatory variables are defined
-  assert:
+  ansible.builtin.assert:
     that:
       - vxlan_interface_name is defined
       - vxlan_vni is defined
 
 - name: Set VXLAN interface facts
-  set_fact:
+  ansible.builtin.set_fact:
     tunnel_local_address: "{{ nodepool.private_ipv4 if nodepool.private_ipv4 | length > 0 else nodepool.public_ipv4 }}"
 
 # We have had cases where the nodepool private or public IP address is not assigned,
 # which causes hard to diagnose errors later on. Catch it early.
 
 - name: Assert that the nodepool private or public IPv4 address is assigned
-  assert:
+  ansible.builtin.assert:
     that: tunnel_local_address in ansible_all_ipv4_addresses
     fail_msg: >-
       The nodepool private/public IP address {{ tunnel_local_address }} is not assigned