From: pmikus Date: Wed, 29 Jul 2020 09:09:00 +0000 (+0000) Subject: Ansible: Nomad 0.12.0 upgrade X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=c0978e207e570be698d1b70b078f4d7c04fc0444 Ansible: Nomad 0.12.0 upgrade + random fixes Signed-off-by: pmikus Change-Id: Icb320d1ba4bbe3b5f99956cf8e89c2a29e114e41 --- diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index 7f1f3b95d1..0904fca6de 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -24,5 +24,6 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index 89809c8917..f003f0d84d 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -24,5 +24,6 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml index 14ef74fcca..f330a19640 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml @@ -39,5 +39,7 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] +nomad_cpu_total_compute: "40000" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml index 33d5dede5e..d7aac45a66 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml @@ -29,7 +29,7 @@ nomad_datacenter: "yul1" nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" nomad_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "both" -nomad_node_class: "s5ci" +nomad_node_class: "builder" nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: true diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml index c24468b71d..f88e882fce 100644 --- a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml @@ -29,7 +29,7 @@ nomad_architecture_map: 32-bit: "386" 64-bit: "amd64" nomad_architecture: "{{ nomad_architecture_map[ansible_architecture] }}" -nomad_version: "0.10.2" +nomad_version: "0.12.0" nomad_pkg: "nomad_{{ nomad_version }}_linux_{{ nomad_architecture }}.zip" nomad_zip_url: "https://releases.hashicorp.com/nomad/{{ nomad_version }}/{{ nomad_pkg }}" diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml index cd52b929bf..e1341b3361 100644 --- a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml @@ -30,6 +30,13 @@ tags: - nomad-conf-user +- name: Inst - Clean Nomad + file: + path: "{{ nomad_inst_dir }}/nomad" + state: "absent" + tags: + - nomad-inst-package + - name: Inst - Download Nomad get_url: url: "{{ nomad_zip_url }}"