seapath_setup_network.yaml: move syslog in role

The syslog-ng configuration of Debian is done inside the debian role. This commit moves the Yocto configuration of syslog also in a role. We should think of a way to have a common syslog-configuration, but I will not do it now. I openned an issue for that : #591 Signed-off-by: Erwann Roussy <[email protected]>
seapath · Sep 4, 2024 · a412cba · a412cba
1 parent 5b7607f
commit a412cba
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 26 deletions.
diff --git a/playbooks/seapath_setup_main.yaml b/playbooks/seapath_setup_main.yaml
@@ -31,6 +31,14 @@
   roles:
     - timemaster
 
+- name: Configure syslog-ng
+  hosts:
+    - cluster_machines
+    - standalone_machine
+  become: true
+  roles:
+    - yocto/syslog
+
 - import_playbook: cluster_setup_ceph.yaml
 - import_playbook: cluster_setup_libvirt.yaml
 - import_playbook: cluster_setup_add_livemigration_user.yaml

diff --git a/playbooks/seapath_setup_network.yaml b/playbooks/seapath_setup_network.yaml
@@ -201,32 +201,6 @@
       enabled: false
     when: dns_servers is not defined
 
-- name: Configure syslog-ng
-  hosts:
-    - cluster_machines
-    - standalone_machine
-  become: true
-  tasks:
-    - name: Set observer IP address in /etc/syslog-ng/syslog-ng.conf
-      lineinfile:
-        dest: /etc/syslog-ng/syslog-ng.conf
-        regexp: '(^\s*#?\s*(ip\()?)("[1-9][0-9]{2}(\.[0-9]{1,3}){3}")(\))?'
-        line: '\1"{{ syslog_server_ip }}"\5'
-        backrefs: true
-        state: present
-      notify:
-        - Restart systemd syslog-ng
-      when: syslog_server_ip is defined
-  handlers:
-    - name: Restart systemd syslog-ng
-      vars:
-        apply_config: "{{ apply_network_config | default(false) }}"
-      ansible.builtin.service:
-        name: syslog-ng@default
-        state: restarted
-      when:
-        apply_config or (need_reboot is defined and not need_reboot)
-
 - name: Configure systemd-networkd-wait-online.service
   hosts:
     - cluster_machines

diff --git a/roles/yocto/syslog/handlers/main.yaml b/roles/yocto/syslog/handlers/main.yaml
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 Savoir-faire Linux, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+---
+- name: Restart systemd syslog-ng
+  ansible.builtin.service:
+    name: syslog-ng@default
+    state: restarted
diff --git a/roles/yocto/syslog/tasks/main.yaml b/roles/yocto/syslog/tasks/main.yaml
@@ -0,0 +1,16 @@
+# Copyright (C) 2024 Savoir-faire Linux, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+# This role setup up syslog-ng on machine
+
+---
+- name: Set observer IP address in /etc/syslog-ng/syslog-ng.conf
+  lineinfile:
+    dest: /etc/syslog-ng/syslog-ng.conf
+    regexp: '(^\s*#?\s*(ip\()?)("[1-9][0-9]{2}(\.[0-9]{1,3}){3}")(\))?'
+    line: '\1"{{ syslog_server_ip }}"\5'
+    backrefs: true
+    state: present
+  notify:
+    - Restart systemd syslog-ng
+  when: syslog_server_ip is defined