Merge pull request #11 from Oefenweb/consistency-changes

Consistency changes

Author: tersmitten

.github/workflows/ci.yml

@@ -44,14 +44,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian10
           - distro: debian11
           - distro: debian12
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
           - distro: ubuntu1804
+            ansible-version: '>=9, <10'
           - distro: ubuntu2004
+          - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
@@ -65,8 +64,8 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
-
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
       - name: Run Molecule tests
         run: |
           molecule test

README.md

@@ -9,6 +9,7 @@ Manage [percona-toolkit](https://www.percona.com/software/mysql-tools/percona-to
 
 * `software-properties-common` (will be installed)
 * `dirmngr` (will be installed)
+* `apt-transport-https` (will be installed)
 
 #### Variables
 

Vagrantfile

@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -23,14 +16,21 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
   },
   {
-    :name => "debian-10",
-    :box => "bento/debian-10",
-    :ip => '10.0.0.18',
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
     :cpu => "50",
-    :ram => "256"
+    :ram => "512"
+  },
+  {
+    :name => "ubuntu-2404",
+    :box => "bento/ubuntu-24.04",
+    :ip => '10.0.0.16',
+    :cpu => "50",
+    :ram => "512"
   },
   {
     :name => "debian-11",
@@ -44,7 +44,7 @@ boxes = [
     :box => "bento/debian-12",
     :ip => '10.0.0.20',
     :cpu => "50",
-    :ram => "256"
+    :ram => "384"
   },
 ]
 

meta/main.yml

@@ -10,12 +10,12 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
+        - jammy
+        - noble
     - name: Debian
       versions:
-        - buster
         - bullseye
         - bookworm
   galaxy_tags:

molecule/default/collections.yml

@@ -1,6 +1,4 @@
 ---
 collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
   - name: community.general
     version: '>=2,<3'

tasks/configure.yml

@@ -6,7 +6,7 @@
     dest: "{{ item }}"
     owner: root
     group: root
-    mode: 0750
+    mode: '0750'
     validate: '/usr/bin/env bash -n %s'
   with_items:
     - /usr/local/bin/pt-deadlock-logger-wrapper

tasks/repository.yml

@@ -1,28 +1,39 @@
 # tasks file
 ---
-- name: repository | install | dependencies (pre)
+- name: repository | install dependencies (pre)
   ansible.builtin.apt:
     name: "{{ percona_toolkit_dependencies_pre }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
   tags:
-    - percona-toolkit-repository-install
     - percona-toolkit-repository-install-dependencies
 
-- name: repository | add public key
+- name: repository | (keyrings) directory | create
+  ansible.builtin.file:
+    path: "{{ percona_toolkit_keyring_dst | dirname }}"
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
+  tags:
+    - percona-toolkit-repository-keyrings-directory-create
+
+- name: repository | (keyring) file | download
   ansible.builtin.apt_key:
-    id: 9334A25F8507EFA5
+    id: "{{ percona_toolkit_keyring_id }}"
     keyserver: "{{ apt_key_keyserver | default('keyserver.ubuntu.com') }}"
+    keyring: "{{ percona_toolkit_keyring_dst }}"
     state: present
   tags:
-    - percona-toolkit-repository-public-key
+    - percona-toolkit-repository-keyring-file-download
 
 - name: repository | add
   ansible.builtin.apt_repository:
     repo: "{{ item.type }} {{ item.url }} {{ item.component }}"
-    state: present
+    state: "{{ item.state | default('present') }}"
     update_cache: true
+    mode: '0644'
   with_items: "{{ percona_toolkit_repositories }}"
   tags:
     - percona-toolkit-repository-add
@@ -33,6 +44,6 @@
     dest: /etc/apt/preferences.d/00percona.pref
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
   tags:
     - percona-toolkit-repository-apt-pin

tests/test.yml

@@ -1,6 +1,7 @@
 # test file
 ---
-- hosts: localhost
+- name: converge
+  hosts: localhost
   connection: local
   become: true
   roles:

tests/vagrant.yml

@@ -1,6 +1,7 @@
 # test file
 ---
-- hosts: all
+- name: converge
+  hosts: all
   remote_user: vagrant
   become: true
   roles:

vars/main.yml

@@ -1,16 +1,28 @@
 # vars file
 ---
+percona_toolkit_keyring_id: 9334A25F8507EFA5
+percona_toolkit_keyring_dst: /usr/share/keyrings/percona.gpg
+
 percona_toolkit_repositories:
+  - type: "deb [signed-by={{ percona_toolkit_keyring_dst }}]"
+    url: "http://repo.percona.com/tools/apt {{ ansible_distribution_release }}"
+    component: main
+  - type: "deb-src [signed-by={{ percona_toolkit_keyring_dst }}]"
+    url: "http://repo.percona.com/tools/apt {{ ansible_distribution_release }}"
+    component: main
   - type: deb
     url: "http://repo.percona.com/tools/apt {{ ansible_distribution_release }}"
     component: main
+    state: absent
   - type: deb-src
     url: "http://repo.percona.com/tools/apt {{ ansible_distribution_release }}"
     component: main
+    state: absent
 
 percona_toolkit_dependencies_pre:
   - software-properties-common
   - dirmngr
+  - apt-transport-https
 
 percona_toolkit_dependencies:
   - percona-toolkit