diff --git a/roles/nomad/meta/main.yml b/roles/nomad/meta/main.yml index e645ea3..c06fb17 100644 --- a/roles/nomad/meta/main.yml +++ b/roles/nomad/meta/main.yml @@ -6,5 +6,3 @@ dependencies: when: nomad_conf.client.enabled and nomad_conf.client.task_drivers['containerd-driver'].enabled # with containerd, we need docker repo to install containerd.io - role: docker when: nomad_conf.client.enabled and nomad_conf.client.task_drivers.docker.enabled - - role: consul_cni - when: nomad_conf.client.enabled diff --git a/roles/nomad/tasks/install.yml b/roles/nomad/tasks/install.yml index 2960b41..dbec0e8 100644 --- a/roles/nomad/tasks/install.yml +++ b/roles/nomad/tasks/install.yml @@ -16,6 +16,11 @@ when: nomad_conf.server.enabled tags: nomad +- name: Install client only componenets + package: name={{ nomad_client_packages }} + when: nomad_conf.client.enabled + tags: nomad + - name: Deploy systemd service unit template: src=nomad.service.j2 dest=/etc/systemd/system/nomad.service register: nomad_unit diff --git a/roles/nomad/templates/nomad.hcl.j2 b/roles/nomad/templates/nomad.hcl.j2 index cdd2a5c..e136978 100644 --- a/roles/nomad/templates/nomad.hcl.j2 +++ b/roles/nomad/templates/nomad.hcl.j2 @@ -90,6 +90,8 @@ server { client { enabled = true + cni_path = "/usr/libexec/cni" + servers = [ {% for server in nomad_servers %} "{{ server }}", diff --git a/roles/nomad/vars/RedHat.yml b/roles/nomad/vars/RedHat.yml index f829899..7e6037d 100644 --- a/roles/nomad/vars/RedHat.yml +++ b/roles/nomad/vars/RedHat.yml @@ -10,10 +10,14 @@ nomad_packages: nomad_server_packages: - nginx +nomad_client_packages: + - containernetworking-plugins + # Note : there's no package for the Docker driver as it'll pull the docker role already nomad_task_driver_packages: java: - java-17-openjdk-headless + - java-21-openjdk-headless qemu: - qemu-kvm podman: diff --git a/roles/vault_bin/defaults/main.yml b/roles/vault_bin/defaults/main.yml index 7b910b7..338afa0 100644 --- a/roles/vault_bin/defaults/main.yml +++ b/roles/vault_bin/defaults/main.yml @@ -1,7 +1,7 @@ # Version of Vault to install -vault_version: 1.19.0 +vault_version: 1.19.1 # URL of the archive vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip # Expected sha256 of the archive -vault_archive_sha256: 9df904271319452bbb37825cfe50726383037550cc04b7c2d0ab09e2f08f82a1 +vault_archive_sha256: a673933f5b02236b5e241e153c0d2fed15b47b48ad640ae886f8b3b567087a05