diff --git a/meta/main.yml b/meta/main.yml index 155ad82..52440f7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,4 +10,5 @@ galaxy_info: versions: - 8 galaxy_tags: [] -dependencies: [] +dependencies: + - ansible.posix diff --git a/tasks/config.yml b/tasks/config.yml index 138dda7..c35d022 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -3,7 +3,7 @@ # sysctl and limits - name: set highmem_is_dirtyable on armv7 builders if applicable - sysctl: + ansible.builtin.sysctl: name: vm.highmem_is_dirtyable value: 1 state: present @@ -12,7 +12,7 @@ when: ansible_architecture == 'armv7l' - name: Set nofile limit to 4096 - copy: + ansible.builtin.copy: src: 00-limit.conf dest: /etc/security/limits.d/00-limit.conf owner: root @@ -21,7 +21,7 @@ # oz and plugins - name: OZ Config - template: + ansible.builtin.template: src: oz.cfg.j2 dest: /etc/oz/oz.cfg owner: root @@ -30,7 +30,7 @@ notify: restart_kojid - name: runroot config - template: + ansible.builtin.template: src: runroot.conf.j2 dest: /etc/kojid/plugins/runroot.conf owner: root @@ -40,7 +40,7 @@ # kojid base configuration - name: Configure koji.conf - template: + ansible.builtin.template: src: koji.conf.j2 dest: /etc/koji.conf owner: root @@ -49,7 +49,7 @@ notify: restart_kojid - name: Configure kojid - template: + ansible.builtin.template: src: kojid.conf.j2 dest: /etc/kojid/kojid.conf owner: root @@ -59,7 +59,7 @@ # systemd override - name: Override kojid.service - copy: + ansible.builtin.copy: src: kojid.service dest: /etc/systemd/system/kojid.service owner: root diff --git a/tasks/packages.yml b/tasks/packages.yml index be91612..059d0af 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -1,20 +1,20 @@ --- # Install packages - name: Install required packages - yum: - name: "{{ kojid_packages }}" + ansible.builtin.dnf: + name: "{{ kojid_packages }}" state: present # armv7l specific - name: Install libkcapi for increased armv7 sockets - yum: + ansible.builtin.dnf: name: libkcapi state: present when: ansible_architecture == 'armv7l' # x86_64 specific - name: Install x86_64 specific packages - yum: + ansible.builtin.dnf: name: - python3-osbs-client state: present diff --git a/tasks/selinux_boolean.yml b/tasks/selinux_boolean.yml index e78f018..91071a0 100644 --- a/tasks/selinux_boolean.yml +++ b/tasks/selinux_boolean.yml @@ -1,7 +1,7 @@ --- - name: Enabling SELinux booleans - seboolean: + ansible.posix.seboolean: name: "{{ item }}" persistent: true state: true diff --git a/tasks/storage.yml b/tasks/storage.yml index 014711c..6b61cf4 100644 --- a/tasks/storage.yml +++ b/tasks/storage.yml @@ -1,7 +1,7 @@ --- # Storage - name: Ensure the koji mountpoint exists - file: + ansible.builtin.file: path: "{{ kojid_mount }}" state: directory owner: apache @@ -9,7 +9,7 @@ mode: '0755' - name: Mount the NFS store - mount: + ansible.builtin.mount: path: "{{ kojid_mount }}" src: "{{ kojid_nfs_path }}" fstype: nfs diff --git a/tasks/users.yml b/tasks/users.yml index cb4a259..04e6f08 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -28,37 +28,37 @@ # group: mock - name: mockbuilder user - user: + ansible.builtin.user: name: mockbuilder groups: mock - name: mockbuilder ssh key - authorized_key: + ansible.posix.authorized_key: user: mockbuilder key: "{{ mockbuilder_pub_key }}" when: mockbuilder_pub_key is defined - name: kojibuilder user - user: + ansible.builtin.user: name: kojibuilder groups: mock - name: kojibuilder ssh key - authorized_key: + ansible.posix.authorized_key: user: kojibuilder key: "{{ kojibuilder_pub_key }}" when: kojibuilder_pub_key is defined # We need the apache user for NFS - name: apache group - group: + ansible.builtin.group: name: apache gid: 48 system: true state: present - name: apache user - user: + ansible.builtin.user: name: apache uid: 48 createhome: false