From 84865d61b87b41c31352d7d6937db7853e209da0 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 25 Sep 2025 13:16:13 +0200 Subject: [PATCH] Install swapfile tool correct --- roles/pkgmgr-install/tasks/main.yml | 2 +- roles/svc-opt-swapfile/tasks/01_core.yml | 12 ++++-------- roles/svc-opt-swapfile/vars/main.yml | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/roles/pkgmgr-install/tasks/main.yml b/roles/pkgmgr-install/tasks/main.yml index 3a2d9fa0..09c657c7 100644 --- a/roles/pkgmgr-install/tasks/main.yml +++ b/roles/pkgmgr-install/tasks/main.yml @@ -4,7 +4,7 @@ run_once_pkgmgr_install: true when: run_once_pkgmgr_install is not defined -- name: update {{ package_name }} +- name: "update {{ package_name }}" ansible.builtin.shell: | source ~/.venvs/pkgmgr/bin/activate pkgmgr update {{ package_name }} --dependencies --clone-mode https diff --git a/roles/svc-opt-swapfile/tasks/01_core.yml b/roles/svc-opt-swapfile/tasks/01_core.yml index 371f4d9d..f21e4095 100644 --- a/roles/svc-opt-swapfile/tasks/01_core.yml +++ b/roles/svc-opt-swapfile/tasks/01_core.yml @@ -1,16 +1,12 @@ -- name: Include dependency 'pkgmgr-install' - include_role: - name: pkgmgr-install - when: run_once_pkgmgr_install is not defined - -- name: "pkgmgr install" +- name: Install ' include_role: name: pkgmgr-install vars: - package_name: swap-forge + package_name: "{{ SWAPFILE_PKG }}" + when: run_once_pkgmgr_install is not defined - name: Execute create swapfile script - shell: swap-forge "{{ SWAPFILE_SIZE }}" + shell: "{{ SWAPFILE_PKG }} '{{ SWAPFILE_SIZE }}'" become: true async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}" poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}" diff --git a/roles/svc-opt-swapfile/vars/main.yml b/roles/svc-opt-swapfile/vars/main.yml index 8be62969..35670594 100644 --- a/roles/svc-opt-swapfile/vars/main.yml +++ b/roles/svc-opt-swapfile/vars/main.yml @@ -1,3 +1,4 @@ application_id: "svc-opt-swapfile" -SWAPFILE_SIZE: "{{ applications | get_app_conf(application_id, 'swapfile_size') }}" \ No newline at end of file +SWAPFILE_SIZE: "{{ applications | get_app_conf(application_id, 'swapfile_size') }}" +SWAPFILE_PKG: "swap-forge" \ No newline at end of file