From 0fb3634c2c655eee86914c29d5d1784afe02764e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Thu, 25 Nov 2021 19:57:24 +0100 Subject: [PATCH] packer: remove forwarding to console MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Console support in AWS EC2 is very basic. We now use vector that works much better than console so we can just drop the forwarding and rely on vector dumping the logs into cloudwatch. Signed-off-by: Ondřej Budai --- .../ansible/roles/common/files/forward-to-console.conf | 3 --- templates/packer/ansible/roles/common/tasks/main.yml | 2 +- .../packer/ansible/roles/common/tasks/systemd.yml | 10 ---------- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 templates/packer/ansible/roles/common/files/forward-to-console.conf diff --git a/templates/packer/ansible/roles/common/files/forward-to-console.conf b/templates/packer/ansible/roles/common/files/forward-to-console.conf deleted file mode 100644 index 74baf6077..000000000 --- a/templates/packer/ansible/roles/common/files/forward-to-console.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Journal] -ForwardToConsole=yes -MaxLevelConsole=6 diff --git a/templates/packer/ansible/roles/common/tasks/main.yml b/templates/packer/ansible/roles/common/tasks/main.yml index 072042a16..7df5a6329 100644 --- a/templates/packer/ansible/roles/common/tasks/main.yml +++ b/templates/packer/ansible/roles/common/tasks/main.yml @@ -3,7 +3,7 @@ # Install various software packages. - include_tasks: packages.yml -# Set systemd/journald overrides +# Set systemd overrides - include_tasks: systemd.yml # Configure monitoring. diff --git a/templates/packer/ansible/roles/common/tasks/systemd.yml b/templates/packer/ansible/roles/common/tasks/systemd.yml index 3aebedd6c..b4fb68502 100644 --- a/templates/packer/ansible/roles/common/tasks/systemd.yml +++ b/templates/packer/ansible/roles/common/tasks/systemd.yml @@ -9,13 +9,3 @@ copy: src: osbuild-composer-override.conf dest: /etc/systemd/system/osbuild-composer.service.d/override.conf - -- name: Create journald override directory - file: - path: /etc/systemd/journald.conf.d - state: directory - -- name: Add journald override to forward messages to the console - copy: - src: forward-to-console.conf - dest: /etc/systemd/journald.conf.d/forward-to-console.conf