feat/nomad-deployment #10

Merged
lanson merged 9 commits from feat/nomad-deployment into main 2024-07-10 17:36:41 +00:00
4 changed files with 34 additions and 1 deletions
Showing only changes of commit ed27759dcd - Show all commits

View File

@ -251,6 +251,14 @@ vault_enable_tls: true
# nomad drivers 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 # # nomad internal tls #
###################### ######################
@ -259,7 +267,6 @@ nomad_enable_tls: true
nomad_tls_configuration: nomad_tls_configuration:
http: true http: true
rpc: true rpc: true
rpc_upgrade_mode: true
ca_file: "/etc/ssl/certs/ca-certificates.crt" ca_file: "/etc/ssl/certs/ca-certificates.crt"
cert_file: "{{ nomad_certificates_directory }}/cert.pem" cert_file: "{{ nomad_certificates_directory }}/cert.pem"
key_file: "{{ nomad_certificates_directory }}/key.pem" key_file: "{{ nomad_certificates_directory }}/key.pem"

View File

@ -250,6 +250,14 @@ nomad_vault_integration_configuration: {}
# nomad drivers 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 # # nomad internal tls #
###################### ######################

View File

@ -148,6 +148,10 @@ nomad_client_configuration:
# nomad drivers configuration # # nomad drivers configuration #
############################### ###############################
nomad_driver_configuration:
raw_exec:
enabled: "{{ nomad_driver_enable_raw_exec | bool }}"
###################### ######################
# nomad internal tls # # nomad internal tls #
###################### ######################

View File

@ -100,6 +100,20 @@
}}" }}"
when: nomad_enable_tls 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" - name: "Nomad | Merge extra configuration settings"
vars: vars:
_config_to_merge: "{{ nomad_extra_configuration }}" _config_to_merge: "{{ nomad_extra_configuration }}"