From 8bf2dd55a2d8c47c9b1e112851efa4a9b17d0ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Sat, 27 Nov 2021 21:11:59 +0100 Subject: [PATCH] packer: remove osbuild-composer.service override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We no longer use this AMI for composer, so we don't need this override. Signed-off-by: Ondřej Budai --- .../roles/common/files/osbuild-composer-override.conf | 3 --- templates/packer/ansible/roles/common/tasks/main.yml | 3 --- .../packer/ansible/roles/common/tasks/systemd.yml | 11 ----------- 3 files changed, 17 deletions(-) delete mode 100644 templates/packer/ansible/roles/common/files/osbuild-composer-override.conf delete mode 100644 templates/packer/ansible/roles/common/tasks/systemd.yml diff --git a/templates/packer/ansible/roles/common/files/osbuild-composer-override.conf b/templates/packer/ansible/roles/common/files/osbuild-composer-override.conf deleted file mode 100644 index d0e602d3c..000000000 --- a/templates/packer/ansible/roles/common/files/osbuild-composer-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=/usr/libexec/osbuild-composer/osbuild-composer -verbose diff --git a/templates/packer/ansible/roles/common/tasks/main.yml b/templates/packer/ansible/roles/common/tasks/main.yml index 7df5a6329..40e729a05 100644 --- a/templates/packer/ansible/roles/common/tasks/main.yml +++ b/templates/packer/ansible/roles/common/tasks/main.yml @@ -3,9 +3,6 @@ # Install various software packages. - include_tasks: packages.yml -# Set systemd overrides -- include_tasks: systemd.yml - # Configure monitoring. - include_tasks: monitoring.yml diff --git a/templates/packer/ansible/roles/common/tasks/systemd.yml b/templates/packer/ansible/roles/common/tasks/systemd.yml deleted file mode 100644 index b4fb68502..000000000 --- a/templates/packer/ansible/roles/common/tasks/systemd.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- name: Create systemd override directory for osbuild-composer - file: - path: /etc/systemd/system/osbuild-composer.service.d/ - state: directory - -- name: Override osbuild-composer to enable access logging - copy: - src: osbuild-composer-override.conf - dest: /etc/systemd/system/osbuild-composer.service.d/override.conf