WIP

Oefenweb · Aug 31, 2023 · 965a237 · 965a237
1 parent 689099b
commit 965a237
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -4,7 +4,7 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml"

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -4,10 +4,10 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/../../tests/vars/_default.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ virtualenv_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -13,7 +13,7 @@
     - virtualenv-install-dependencies
 
 - name: install
-  pip:
+  ansible.builtin.pip:
     name: "{{ virtualenv_pip_dependencies }}"
     state: latest
     executable: "pip{{ virtualenv_python_version_major | string }}"

diff --git a/tests/tasks/pre.yml b/tests/tasks/pre.yml
@@ -1,7 +1,7 @@
 # pre test file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
       - curl
@@ -10,7 +10,7 @@
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
 
 - name: install pip  # noqa command-instead-of-module
-  shell: >
+  ansible.builtin.shell: >
     curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version_major | string }} -
   changed_when: false
   tags:

diff --git a/tests/test.yml b/tests/test.yml
@@ -5,13 +5,13 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../
 #  vars:

diff --git a/tests/vagrant.yml b/tests/vagrant.yml
@@ -5,12 +5,12 @@
   become: true
   pre_tasks:
     - name: include variables
-      include_vars: "{{ item }}"
+      ansible.builtin.include_vars: "{{ item }}"
       with_first_found:
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
         - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
         - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../