Merge branch 'keyrings' into 'master'

keyring

See merge request tools/ansible/roles/gitlab_omnibus!21

tasks/ubuntu/main.yml

@@ -25,11 +25,11 @@
   ansible.builtin.apt_key:
     url: https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey
     state: present
-    keyring: /etc/apt/trusted.gpg.d/gitlab_gitlab-ce.gpg
+    keyring: /etc/apt/keyrings/gitlab_gitlab-ce.gpg
 
 - name: Add specified repository into sources list
   ansible.builtin.apt_repository:
-    repo: deb https://packages.gitlab.com/gitlab/gitlab-ce/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release | lower }} main
+    repo: deb [signed-by=/etc/apt/keyrings/gitlab_gitlab-ce.gpg] https://packages.gitlab.com/gitlab/gitlab-ce/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release | lower }} main
     filename: gitlab_gitlab-ce
     state: present