Fixes #22183: Ansible collection should support the renaming of the server packages starting 7.2+

roles/rudder_relay/defaults/main.yml

@@ -1,9 +1,9 @@
 policy_server: rudder.server
-server_version: 7.0
+relay_version: 7.2
 rudder_repository_username: ""
 rudder_repository_password: ""
 rudder_repository: repository.rudder.io
 rudder_repository_url: ""
 update_cache: yes
 apt_key_url: "https://repository.rudder.io/apt/rudder_apt_key.pub"
-rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub"
+rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub"

roles/rudder_relay/meta/main.yml

@@ -54,5 +54,5 @@ dependencies:
       rudder_update_cache: "{{ update_cache }}"
       repository_username: "{{ rudder_repository_username }}"
       repository_password: "{{ rudder_repository_password }}"
-      apt_key_url: "{{ rudder_apt_key_url }}"
-      rpm_key_url: "{{ rudder_rpm_key_url }}"
+      rudder_apt_key_url: "{{ apt_key_url }}"
+      rudder_rpm_key_url: "{{ rpm_key_url }}"

roles/rudder_relay/molecule/default/debian.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  apt:
+    name: rudder-relay
+    state: present
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/default/molecule.yml

@@ -1,14 +1,16 @@
----
 dependency:
   name: galaxy
 driver:
   name: docker
 platforms:
-    - name: centos8
-      image: geerlingguy/docker-centos8-ansible:latest
-
+  - name: instance
+    image: quay.io/centos/centos:stream8
+    command: /sbin/init
+    capabilities:
+      - SYS_ADMIN
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
-
 verifier:
   name: ansible

roles/rudder_relay/molecule/default/redhat.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  yum:
+    name: rudder-relay
+    state: present
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/default/sles.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  zypper:
+    name: rudder-relay
+    state: latest
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/default/verify.yml

@@ -21,3 +21,10 @@
       assert:
         that:
           - current_policy_server.stdout == "rudder.server"
+
+    - include_tasks: redhat.yml
+      when: ansible_os_family == "RedHat"
+    - include_tasks: debian.yml
+      when: ansible_os_family == "Debian"
+    - include_tasks: sles.yml
+      when: ansible_os_family == "Suse"

roles/rudder_relay/molecule/old_versions/converge.yml

@@ -0,0 +1,9 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+    - name: "Include rudder_relay"
+      include_role:
+        name: "rudder_relay"
+      vars:
+        relay_version: 7.1

roles/rudder_relay/molecule/old_versions/debian.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  apt:
+    name: rudder-server-relay
+    state: present
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/old_versions/molecule.yml

@@ -0,0 +1,16 @@
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: quay.io/centos/centos:stream8
+    command: /sbin/init
+    capabilities:
+      - SYS_ADMIN
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+verifier:
+  name: ansible

roles/rudder_relay/molecule/old_versions/redhat.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  yum:
+    name: rudder-server-relay
+    state: present
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/old_versions/sles.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Relay
+  zypper:
+    name: rudder-server-relay
+    state: latest
+  register: relay_installed
+  failed_when: (relay_installed is changed) or (relay_installed is failed)

roles/rudder_relay/molecule/old_versions/verify.yml

@@ -0,0 +1,30 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+    - name: Get rudder cli path
+      command: which rudder
+      register: rudder_path
+
+    - name: Get rudder policy server
+      command: cat /var/rudder/cfengine-community/policy_server.dat
+      register: current_policy_server
+
+    - name: Rudder-agent must be installed
+      assert:
+        that:
+          - rudder_path.stdout == "/usr/bin/rudder"
+
+    - name: Policy server must be configured
+      assert:
+        that:
+          - current_policy_server.stdout == "rudder.server"
+
+    - include_tasks: redhat.yml
+      when: ansible_os_family == "RedHat"
+    - include_tasks: debian.yml
+      when: ansible_os_family == "Debian"
+    - include_tasks: sles.yml
+      when: ansible_os_family == "Suse"

roles/rudder_relay/tasks/debian.yml

@@ -1,6 +1,6 @@
 - name: Install Rudder Relay
   apt:
-    name: rudder-server-relay
+    name: "{{ rudder_relay_package_name }}"
     state: latest
   notify:
     - Send inventory

roles/rudder_relay/tasks/main.yml

@@ -1,3 +1,9 @@
+- include_vars: "before_7.2.yml"
+  when: relay_version is version('7.2', '<')
+
+- include_vars: "after_7.2.yml"
+  when: relay_version is version('7.2', '>=')
+
 - include_tasks: sles.yml
   when: ansible_os_family == "Suse"
 

roles/rudder_relay/tasks/redhat.yml

@@ -1,6 +1,6 @@
 - name: Install Rudder Relay
   yum:
-    name: rudder-server-relay
+    name: "{{ rudder_relay_package_name }}"
     state: latest
   notify:
     - Send inventory

roles/rudder_relay/tasks/sles.yml

@@ -1,6 +1,6 @@
 - name: Install Rudder Relay
   zypper:
-    name: rudder-server-relay
+    name: "{{ rudder_relay_package_name }}"
     state: latest
   notify:
     - Send inventory

roles/rudder_relay/vars/after_7.2.yml

@@ -0,0 +1,2 @@
+rudder_server_package_name: "rudder-server"
+rudder_relay_package_name: "rudder-relay"

roles/rudder_relay/vars/before_7.2.yml

@@ -0,0 +1,2 @@
+rudder_server_package_name: "rudder-server-root"
+rudder_relay_package_name: "rudder-server-relay"

roles/rudder_server/README.md

@@ -2,7 +2,7 @@
 
 #### Role variables
 
-- `server_version`: Rudder version(default: `7.0`)
+- `server_version`: Rudder version(default: `7.2`)
 - `rudder_repository`: Rudder repository domain (default: `repository.rudder.io`)
 - `rudder_repository_url`: Complete Rudder repository URL (default: `empty`), used only when not empty, replace the server_version and rudder_repository when used.
 - `rudder_repository_username`: Optional username to pass to repository if using credentials

roles/rudder_server/defaults/main.yml

@@ -1,9 +1,9 @@
 ---
-server_version: 7.0
+server_version: 7.2
 rudder_repository_username: ""
 rudder_repository_password: ""
 rudder_repository: repository.rudder.io
 rudder_repository_url: ""
 update_cache: yes
 apt_key_url: "https://repository.rudder.io/apt/rudder_apt_key.pub"
-rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub"
+rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub"

roles/rudder_server/molecule/default/debian.yml

@@ -1,6 +1,6 @@
-- name: Install Rudder Agent
+- name: Install Rudder Server
   apt:
-    name: rudder-server-root
+    name: rudder-server
     state: present
   register: server_installed
   failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/default/molecule.yml

@@ -4,9 +4,12 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: geerlingguy/docker-centos8-ansible
-    pre_build_image: true
-    command: "yum update --disablerepo=appstream"
+    image: quay.io/centos/centos:stream8
+    command: /sbin/init
+    capabilities:
+      - SYS_ADMIN
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
 verifier:

roles/rudder_server/molecule/default/redhat.yml

@@ -1,6 +1,6 @@
-- name: Install Rudder Agent
+- name: Install Rudder Server
   yum:
-    name: rudder-server-root
+    name: rudder-server
     state: present
   register: server_installed
   failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/default/sles.yml

@@ -1,6 +1,6 @@
-- name: Install Rudder Agent
+- name: Install Rudder Server
   zypper:
-    name: rudder-server-root
+    name: rudder-server
     state: latest
   register: server_installed
   failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/old_versions/converge.yml

@@ -0,0 +1,8 @@
+- name: Converge
+  hosts: all
+  tasks:
+    - name: "Include rudder_server"
+      include_role:
+        name: "rudder_server"
+      vars:
+        server_version: 7.1

roles/rudder_server/molecule/old_versions/debian.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Agent
+  apt:
+    name: rudder-server-root
+    state: present
+  register: server_installed
+  failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/old_versions/molecule.yml

@@ -0,0 +1,16 @@
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: quay.io/centos/centos:stream8
+    command: /sbin/init
+    capabilities:
+      - SYS_ADMIN
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+verifier:
+  name: ansible

roles/rudder_server/molecule/old_versions/redhat.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Agent
+  yum:
+    name: rudder-server-root
+    state: present
+  register: server_installed
+  failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/old_versions/sles.yml

@@ -0,0 +1,6 @@
+- name: Install Rudder Agent
+  zypper:
+    name: rudder-server-root
+    state: latest
+  register: server_installed
+  failed_when: (server_installed is changed) or (server_installed is failed)

roles/rudder_server/molecule/old_versions/verify.yml

@@ -0,0 +1,21 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+    - name: Get rudder cli path
+      command: which rudder
+      register: rudder_path
+
+    - name: Rudder-agent must be installed
+      assert:
+        that:
+          - rudder_path.stdout == "/usr/bin/rudder"
+
+    - include_tasks: redhat.yml
+      when: ansible_os_family == "RedHat"
+    - include_tasks: debian.yml
+      when: ansible_os_family == "Debian"
+    - include_tasks: sles.yml
+      when: ansible_os_family == "Suse"

roles/rudder_server/tasks/debian.yml

@@ -1,4 +1,4 @@
 - name: Install Rudder Server
   apt:
-    name: rudder-server-root
+    name: "{{ rudder_server_package_name }}"
     state: latest

roles/rudder_server/tasks/main.yml

@@ -1,3 +1,9 @@
+- include_vars: "before_7.2.yml"
+  when: server_version is version('7.2', '<')
+
+- include_vars: "after_7.2.yml"
+  when: server_version is version('7.2', '>=')
+
 - include_tasks: sles.yml
   when: ansible_os_family == "Suse"
 

roles/rudder_server/tasks/redhat.yml

@@ -1,4 +1,4 @@
 - name: Install Rudder Server
   yum:
-    name: rudder-server-root
+    name: "{{ rudder_server_package_name }}"
     state: latest

roles/rudder_server/tasks/sles.yml

@@ -1,4 +1,4 @@
 - name: Install Rudder Server
   zypper:
-    name: rudder-server-root
+    name: "{{ rudder_server_package_name }}"
     state: latest

roles/rudder_server/vars/after_7.2.yml

@@ -0,0 +1,2 @@
+rudder_server_package_name: "rudder-server"
+rudder_relay_package_name: "rudder-relay"

roles/rudder_server/vars/before_7.2.yml

@@ -0,0 +1,2 @@
+rudder_server_package_name: "rudder-server-root"
+rudder_relay_package_name: "rudder-server-relay"