From da96ab486d6202a19b08bf3e0170f4d2a52574bb Mon Sep 17 00:00:00 2001 From: Thomas Wimprine Date: Sat, 4 Nov 2023 08:26:52 -0500 Subject: [PATCH] Fixed Debian install --- .vscode/settings.json | 3 +++ tasks/install.yml | 2 +- vars/Debian.yml | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..5d71af86 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "ansible.python.interpreterPath": "/bin/python3" +} \ No newline at end of file diff --git a/tasks/install.yml b/tasks/install.yml index 2424fef9..d68b28ae 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -83,7 +83,7 @@ - name: Install Nomad copy: - src: "{{ install_temp.path }}/nomad" + src: "{{ install_temp.path }}" dest: "{{ nomad_bin_dir }}" owner: "{{ nomad_user }}" group: "{{ nomad_group }}" diff --git a/vars/Debian.yml b/vars/Debian.yml index 463c6256..1e7698cb 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -4,7 +4,6 @@ nomad_os_packages: - curl - git - - libcgroup1 - unzip - "{% if ( ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('19', '<') ) or \ ( ansible_distribution == 'Debian' and ansible_distribution_version is version('11', '<') ) \ @@ -13,3 +12,10 @@ nomad_os_packages: {% else %}\ cgroup-tools\ {% endif %}" + - "{% if ( ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('19', '<') ) or \ + ( ansible_distribution == 'Debian' and ansible_distribution_version is version('11', '<') ) \ + %}\ + libcgroup1\ + {% else %}\ + libcgroup2\ + {% endif %}"