diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..2de2499 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "ansible.python.interpreterPath": "/opt/local/bin/python3.10" +} \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index dfe6891..9320f44 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,9 @@ epas_client_timbrature_docker_registry_user: 'epas.user' epas_client_timbrature_docker_registry_pwd: 'use a vault file' epas_client_timbrature_docker_client_timbrature_image: '{{ epas_client_timbrature_docker_registry }}/epas/area-pisa-client:latest' epas_client_timbrature_docker_client_timbrature_data_node: 'localhost' +epas_client_timbrature_data_remote_volume: false +epas_client_timbrature_data_remote_volume_opts: "nfsvers=4,addr=127.0.0.1,rw" +epas_client_timbrature_data_remote_volume_dev: ":/mnt" epas_client_timbrature_data_volume: 'epas_dati_timbrature' epas_client_timbrature_node_constraints: 'node.labels.epas_client == timbrature' epas_client_timbrature_behind_haproxy: False diff --git a/meta/main.yml b/meta/main.yml index 95524c5..d3ecaaa 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,25 +1,11 @@ galaxy_info: author: Andrea Dell'Amico - description: Systems Architect + namespace: adellam + role_name: epas_client_timbrature + description: Role that installs the EPAS client that collects data from the badge readers company: ISTI-CNR - - issue_tracker_url: https://support.d4science.org/projects/d4science-operation - license: EUPL 1.2+ - - min_ansible_version: 2.8 - - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - platforms: - - name: Ubuntu - versions: - - bionic - - name: EL - versions: - - 7 - + min_ansible_version: "2.9" galaxy_tags: - epas diff --git a/templates/epas-client-timbrature-docker-compose.yml.j2 b/templates/epas-client-timbrature-docker-compose.yml.j2 index b41533e..e6f40fc 100644 --- a/templates/epas-client-timbrature-docker-compose.yml.j2 +++ b/templates/epas-client-timbrature-docker-compose.yml.j2 @@ -8,6 +8,14 @@ networks: volumes: {{ epas_client_timbrature_data_volume }}: +{% if epas_client_timbrature_data_remote_volume %} + driver: local + driver_opts: + type: nfs4 + o: "{{ epas_client_timbrature_data_remote_volume_opts }}" + device: "{{ epas_client_timbrature_data_remote_volume_dev }}" + +{% endif %} services: {{ epas_client_timbrature_service_name }}: