Refactor existing roles, put timemaster inside a role

.gitmodules

@@ -3,19 +3,17 @@
 	url = https://github.com/ceph/ceph-ansible.git
 	ignore = dirty
 	branch = stable-6.0
-[submodule "src/debian/python3-setup-ovs"]
-	path = src/debian/python3-setup-ovs
-	url = https://github.com/seapath/python3-setup-ovs.git
-	branch = main
-[submodule "src/debian/vm_manager"]
-	path = src/debian/vm_manager
-	url = https://github.com/seapath/vm_manager.git
-        branch = main
-[submodule "src/cukinia-tests"]
-	path = src/cukinia-tests
+[submodule "roles/deploy_cukinia_tests/cukinia-tests"]
+	path = roles/deploy_cukinia_tests/cukinia-tests
 	url = https://github.com/seapath/cukinia-tests.git
         branch = main
-[submodule "src/cukinia"]
-	path = src/cukinia
+[submodule "roles/deploy_cukinia/files/cukinia"]
+	path = roles/deploy_cukinia/files/cukinia
 	url = https://github.com/savoirfairelinux/cukinia.git
         branch = master
+[submodule "roles/deploy_python3_setup_ovs/files/python3-setup-ovs"]
+	path = roles/deploy_python3_setup_ovs/files/python3-setup-ovs
+	url = https://github.com/seapath/python3-setup-ovs.git
+[submodule "roles/deploy_vm_manager/files/vm_manager"]
+	path = roles/deploy_vm_manager/files/vm_manager
+	url = https://github.com/seapath/vm_manager.git

playbooks/ci_test.yaml

@@ -5,6 +5,15 @@
 # SEAPATH.
 
 ---
-- import_playbook: ./test_deploy_cukinia.yaml
+
+- name: deploy cukinia
+  hosts:
+    - cluster_machines
+    - standalone_machine
+    - VMs
+  become: true
+  roles:
+    - deploy_cukinia
+
 - import_playbook: ./test_deploy_cukinia_tests.yaml
 - import_playbook: ./test_run_cukinia.yaml

playbooks/seapath_setup_hardened_debian.yaml

@@ -11,7 +11,7 @@
   vars:
     revert: false
   roles:
-    - debian/hardening
+    - debian_hardening
 - name: Add hardened for SEAPATH physical machines
   become: true
   hosts:
@@ -20,7 +20,7 @@
   vars:
     revert: false
   roles:
-    - debian/hardening/physical_machine
+    - debian_hardening_physical_machine
 
 - name: Reboot to apply hardening
   become: true

playbooks/seapath_setup_main.yaml

@@ -28,6 +28,22 @@
 
 - import_playbook: seapath_setup_network.yaml
 
+- name: Configure timemaster
+  hosts:
+    - cluster_machines
+    - standalone_machine
+  become: true
+  roles:
+    - timemaster
+
+- name: Configure snmp
+  hosts:
+    - cluster_machines
+    - standalone_machine
+  become: true
+  roles:
+    - snmp
+
 - import_playbook: cluster_setup_ceph.yaml
 - import_playbook: cluster_setup_libvirt.yaml
 - import_playbook: cluster_setup_add_livemigration_user.yaml

playbooks/seapath_setup_network.yaml

@@ -2,24 +2,21 @@
 # Copyright (C) 2024 Savoir-faire Linux, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-# This Ansible playbook configures the networks and defines the hostnames. It
-# can be used on cluster machines and VMs.
+# This Ansible playbook configures the networks and defines the hostnames.
 
 ---
-- name: Get distrebution variables
+- name: Get distribution variables
   gather_facts: true
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   tasks:
   - include_vars: "../vars/{{ ansible_distribution }}_paths.yml"
 
 - name: Network configuration basics
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   become: true
   tasks:
     - block:
@@ -63,24 +60,11 @@
     - role: systemd_networkd
       when: netplan_configurations is not defined
 
-- name: Apply network with systemd-networkd roles on VMs
-  become: true
-  hosts:
-    - VMs
-  vars_files:
-    - ../vars/network_vars.yml
-  vars:
-    systemd_networkd_apply_config: "true"
-  roles:
-    - role: systemd_networkd
-      when: netplan_configurations is not defined
-
 - name: Apply network config with netplan
   become: true
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   tasks:
     - block:
         - name: Create /etc/netplan directory
@@ -248,7 +232,6 @@
 - name: Configure hosts and hostname
   hosts:
     - standalone_machine
-    - VMs
   become: true
   tasks:
     - name: Set hostname
@@ -270,7 +253,6 @@
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   become: true
   tasks:
     - block:
@@ -319,7 +301,6 @@
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   become: true
   tasks:
     - block:
@@ -363,7 +344,6 @@
   hosts:
     - cluster_machines
     - standalone_machine
-    - VMs
   become: true
   tasks:
   - name: Stop and disable systemd-resolved
@@ -373,72 +353,6 @@
       enabled: false
     when: dns_servers is not defined
 
-- name: Configure TimeMaster
-  hosts:
-    - cluster_machines
-    - standalone_machine
-  become: true
-  vars:
-    apply_config: "{{ apply_network_config | default(false) }}"
-  tasks:
-    - name: Populate service facts
-      service_facts:
-    - name: stop and disable systemd-timesyncd if it exists
-      service:
-        name: "systemd-timesyncd"
-        state: stopped
-        enabled: false
-      when: "'systemd-timesyncd.service' in services"
-    - name: Create timemaster configuration
-      template:
-        src: ../templates/timemaster.conf.j2
-        dest: "{{ path_timemaster_conf }}"
-      register: timemasterconf1
-    - name: comment pool configuration in chrony.conf
-      replace:
-        path: "{{ path_chrony_conf }}"
-        regexp: '^(pool .*)'
-        replace: '#\1'
-      register: timemasterconf2
-    - name: Create timemaster.service.d directory
-      file:
-        path: /etc/systemd/system/timemaster.service.d/
-        state: directory
-        owner: root
-        group: root
-        mode: 0755
-    - name: Copy timemaster.service overide
-      template:
-        src: ../templates/timemaster.service.j2
-        dest: /etc/systemd/system/timemaster.service.d/override.conf
-      register: timemasterconf3
-    - name: Enable timemaster
-      service:
-        name: "timemaster"
-        enabled: true
-    - name: restart timemaster if necessary
-      service:
-        name: "timemaster"
-        state: restarted
-        enabled: true
-        daemon_reload: true
-      when:
-        - timemasterconf1.changed or timemasterconf2.changed or timemasterconf3.changed
-        - apply_config or need_reboot is not defined or not need_reboot
-
-- name: Stop chrony service
-  hosts:
-    - cluster_machines
-    - standalone_machine
-    - VMs
-  become: true
-  tasks:
-    - name: stop and disable chrony
-      service:
-        name: "{{ service_name_chrony }}"
-        state: stopped
-        enabled: false
-
 - name: Configure systemd-networkd-wait-online.service
   hosts:
     - cluster_machines
@@ -583,14 +497,6 @@
             state: stopped
       when: conntrackd_ignore_ip_list is not defined
 
-- name: Configure snmp
-  hosts:
-    - cluster_machines
-    - standalone_machine
-  become: true
-  roles:
-    - snmp
-
 - name: Restart machine if needed
   hosts:
     - cluster_machines

playbooks/seapath_setup_prerequiscentos.yaml

@@ -16,14 +16,14 @@
     - standalone_machine
   become: true
   roles:
-    - centos/physical_machine
+    - centos_physical_machine
 - name: Prerequis hypervisor centos
   hosts:
     - hypervisors
     - standalone_machine
   become: true
   roles:
-    - centos/hypervisor
+    - centos_hypervisor
 
 - name: Add admin user to haclient group
   hosts:

playbooks/seapath_setup_prerequisdebian.yaml

@@ -16,14 +16,14 @@
     - standalone_machine
   become: true
   roles:
-    - debian/physical_machine
+    - debian_physical_machine
 - name: Prerequis hypervisor debian
   hosts:
     - hypervisors
     - standalone_machine
   become: true
   roles:
-    - debian/hypervisor
+    - debian_hypervisor
 
 - name: Add admin user to haclient group
   hosts:

playbooks/seapath_setup_unhardened_debian.yaml

@@ -11,7 +11,7 @@
   vars:
     revert: true
   roles:
-    - debian/hardening
+    - debian_hardening
 - name: Remove hardened for SEAPATH physical machines
   become: true
   hosts:
@@ -20,7 +20,7 @@
   vars:
     revert: true
   roles:
-    - debian/hardening/physical_machine
+    - debian_hardening_physical_machine
 
 - name: Reboot to apply hardening revert
   become: true