diff --git a/molecule/no_tls_multi_node/etc/hashistack/globals.yml b/molecule/no_tls_multi_node/etc/hashistack/globals.yml index 1085d6c..11dc568 100644 --- a/molecule/no_tls_multi_node/etc/hashistack/globals.yml +++ b/molecule/no_tls_multi_node/etc/hashistack/globals.yml @@ -251,6 +251,14 @@ vault_enable_tls: true # nomad drivers configuration # ############################### +# nomad_driver_enable_docker: yes +# nomad_driver_enable_podman: no +# nomad_driver_enable_raw_exec: no +# nomad_driver_enable_java: no +# nomad_driver_enable_qemu: no + +# nomad_driver_extra_configuration: {} + ###################### # nomad internal tls # ###################### @@ -259,7 +267,6 @@ nomad_enable_tls: true nomad_tls_configuration: http: true rpc: true - rpc_upgrade_mode: true ca_file: "/etc/ssl/certs/ca-certificates.crt" cert_file: "{{ nomad_certificates_directory }}/cert.pem" key_file: "{{ nomad_certificates_directory }}/key.pem" diff --git a/playbooks/group_vars/all/globals.yml b/playbooks/group_vars/all/globals.yml index a781220..ddfae4f 100644 --- a/playbooks/group_vars/all/globals.yml +++ b/playbooks/group_vars/all/globals.yml @@ -250,6 +250,14 @@ nomad_vault_integration_configuration: {} # nomad drivers configuration # ############################### +nomad_driver_enable_docker: yes +nomad_driver_enable_podman: no +nomad_driver_enable_raw_exec: no +nomad_driver_enable_java: no +nomad_driver_enable_qemu: no + +nomad_driver_extra_configuration: {} + ###################### # nomad internal tls # ###################### diff --git a/playbooks/group_vars/all/nomad.yml b/playbooks/group_vars/all/nomad.yml index d885439..2a4500e 100644 --- a/playbooks/group_vars/all/nomad.yml +++ b/playbooks/group_vars/all/nomad.yml @@ -148,6 +148,10 @@ nomad_client_configuration: # nomad drivers configuration # ############################### +nomad_driver_configuration: + raw_exec: + enabled: "{{ nomad_driver_enable_raw_exec | bool }}" + ###################### # nomad internal tls # ###################### diff --git a/playbooks/tasks/nomad/nomad_vars.yml b/playbooks/tasks/nomad/nomad_vars.yml index 10a1ce5..97c6af2 100644 --- a/playbooks/tasks/nomad/nomad_vars.yml +++ b/playbooks/tasks/nomad/nomad_vars.yml @@ -100,6 +100,20 @@ }}" when: nomad_enable_tls +- name: "Nomad | Merge plugin configuration" + vars: + _config_to_merge: + plugin: "{{ + nomad_driver_configuration | + combine(nomad_driver_extra_configuration, recursive=true) + }}" + ansible.builtin.set_fact: + hashicorp_nomad_configuration: "{{ + hashicorp_nomad_configuration | + combine(_config_to_merge, recursive=true) + }}" + when: "'nomad_clients' in group_names" + - name: "Nomad | Merge extra configuration settings" vars: _config_to_merge: "{{ nomad_extra_configuration }}"