From 323569fe7341d1b7591fe67a07f5e8451170bd80 Mon Sep 17 00:00:00 2001
From: vishesh92 <vishesh92@gmail.com>
Date: Thu, 28 Aug 2025 12:56:19 +0530
Subject: [PATCH] Add support for el10

---
 .../roles/cloudstack-manager/tasks/main.yml   |  2 +-
 .../cloudstack-manager/tasks/setup-mgmt.yml   | 43 +++----------------
 Ansible/roles/kvm/tasks/main.yml              |  4 +-
 Ansible/roles/mysql/tasks/el9.yml             |  4 +-
 Ansible/roles/mysql/tasks/main.yml            |  2 +-
 .../roles/mysql/templates/my-centos8.cnf.j2   |  2 +
 Ansible/roles/timezone/tasks/main.yml         |  2 +-
 7 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/Ansible/roles/cloudstack-manager/tasks/main.yml b/Ansible/roles/cloudstack-manager/tasks/main.yml
index a1c8622c6e..adc1aadeb1 100644
--- a/Ansible/roles/cloudstack-manager/tasks/main.yml
+++ b/Ansible/roles/cloudstack-manager/tasks/main.yml
@@ -51,7 +51,7 @@
   when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 8 )
 
 - include: ./el9.yml
-  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 9 )
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 9 )
 
 - include: ./suse.yml
   when: ansible_distribution == 'SUSE'
diff --git a/Ansible/roles/cloudstack-manager/tasks/setup-mgmt.yml b/Ansible/roles/cloudstack-manager/tasks/setup-mgmt.yml
index 12a6db7bcc..0937e9f991 100644
--- a/Ansible/roles/cloudstack-manager/tasks/setup-mgmt.yml
+++ b/Ansible/roles/cloudstack-manager/tasks/setup-mgmt.yml
@@ -11,9 +11,12 @@
 - debug:
     msg: "cloudstack not cloud is {{ path_is_cloudstack.stat.exists }} and the OS version is {{ ansible_distribution_major_version }}"
 
-- name: Setup CloudStack Manager (centos/rhel6)
+- name: Setup CloudStack Manager (centos/rhel8+/suse/ubuntu/debian or centos/rhel7 ACS < 4.6)
   shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: (ansible_distribution_major_version|int == 6) and (path_is_cloudstack.stat.exists|bool == True)
+  when: >
+    ((ansible_distribution_major_version|int == 6) and (path_is_cloudstack.stat.exists|bool == True)) or
+    ((ansible_distribution_major_version == "7") and (env_numversion | version_compare('4.6','<'))) or
+    (ansible_distribution in ["SUSE", "Ubuntu", "Debian"] or ansible_distribution_major_version|int >= 8)
   tags:
     - setup_mgmt
 
@@ -34,39 +37,3 @@
   when: (ansible_distribution_major_version == "7") and (env_numversion | version_compare('4.6','>=')) and (env_numversion | version_compare('4.11','<'))
   tags:
     - setup_mgmt
-
-- name: Setup CloudStack Manager (centos/rhel7) ACS < 4.6
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: (ansible_distribution_major_version == "7") and (env_numversion | version_compare('4.6','<'))
-  tags:
-    - setup_mgmt
-
-- name: Setup CloudStack Manager (centos/rhel8)
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: ansible_distribution_major_version|int == 8
-  tags:
-    - setup_mgmt
-
-- name: Setup CloudStack Manager (SUSE)
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: ansible_distribution == "SUSE"
-  tags:
-    - setup_mgmt
-
-- name: Setup CloudStack Manager (Ubuntu)
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: ansible_distribution == "Ubuntu"
-  tags:
-    - setup_mgmt
-
-- name: Setup CloudStack Manager (Debian)
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: ansible_distribution == "Debian"
-  tags: 
-    - setup_mgmt
-
-- name: Setup CloudStack Manager (el9)
-  shell: sleep {{ play_hosts.index(inventory_hostname) | int * 15 }} && /usr/bin/cloudstack-setup-management
-  when: ansible_distribution_major_version|int == 9
-  tags:
-    - setup_mgmt
diff --git a/Ansible/roles/kvm/tasks/main.yml b/Ansible/roles/kvm/tasks/main.yml
index 0d2ee81427..572b79b5fc 100644
--- a/Ansible/roles/kvm/tasks/main.yml
+++ b/Ansible/roles/kvm/tasks/main.yml
@@ -73,9 +73,9 @@
   tags:
     - kvm
 
-- name: Configure EL9 VMs for KVM
+- name: Configure EL9 or EL10 VMs for KVM
   include: ./el9.yml
-  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 9 )
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 9 )
   tags:
     - kvm
 
diff --git a/Ansible/roles/mysql/tasks/el9.yml b/Ansible/roles/mysql/tasks/el9.yml
index 0214e8ab6e..52c89c5cec 100644
--- a/Ansible/roles/mysql/tasks/el9.yml
+++ b/Ansible/roles/mysql/tasks/el9.yml
@@ -62,7 +62,7 @@
 
 - name: Ensure mysql server is installed
   dnf:
-    name: mysql-server
+    name: mysql*-server
     state: present
   register: mysqlinstalled
   tags:
@@ -98,7 +98,7 @@
 # - name: Nuke everything since it's starting from scratch
 #   shell: rm -rf /var/lib/mysql/*
 
-- name: Ensure MySQL service is started and set to start on boot (el9)
+- name: Ensure MySQL service is started and set to start on boot (el9/el10)
   shell: systemctl enable mysqld && systemctl restart mysqld
   when: mysqlinstalled.changed
   tags:
diff --git a/Ansible/roles/mysql/tasks/main.yml b/Ansible/roles/mysql/tasks/main.yml
index ae3f8bd269..faccf4fd55 100644
--- a/Ansible/roles/mysql/tasks/main.yml
+++ b/Ansible/roles/mysql/tasks/main.yml
@@ -77,7 +77,7 @@
     - mysqlconf
 
 - include: ./el9.yml
-  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 9 )
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 9 )
   tags:
     - mysql
     - mysqlconf
diff --git a/Ansible/roles/mysql/templates/my-centos8.cnf.j2 b/Ansible/roles/mysql/templates/my-centos8.cnf.j2
index 4dd954365a..50a5c6979b 100644
--- a/Ansible/roles/mysql/templates/my-centos8.cnf.j2
+++ b/Ansible/roles/mysql/templates/my-centos8.cnf.j2
@@ -22,7 +22,9 @@ datadir=/var/lib/mysql
 max_connections={{ mysql_max_connections }}
 skip_name_resolve
 
+{% if ansible_distribution_major_version|int < 10 %}
 default_authentication_plugin=mysql_native_password
+{% endif %}
 
 innodb_buffer_pool_size={{ mysql_innodb_buffer_pool_size }}
 innodb_file_per_table=1
diff --git a/Ansible/roles/timezone/tasks/main.yml b/Ansible/roles/timezone/tasks/main.yml
index 5990002fe4..cace15de21 100644
--- a/Ansible/roles/timezone/tasks/main.yml
+++ b/Ansible/roles/timezone/tasks/main.yml
@@ -34,7 +34,7 @@
   when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 8 )
 
 - include: ./el9.yml
-  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int == 9 )
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 9 )
 
 - include: ./ubuntu.yml
   when: ansible_distribution == 'Ubuntu'