Fix configure step for iCAT

UtrechtUniversity · Nov 21, 2024 · d2acbb2 · d2acbb2
1 parent df1d6c6
commit d2acbb2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/roles/irods_icat/tasks/main.yml b/roles/irods_icat/tasks/main.yml
@@ -132,7 +132,7 @@
 
 - name: Configure iRODS iCAT server
   become: true
-  ansible.builtin.command: python /var/lib/irods/scripts/setup_irods.py --json_configuration_file=/etc/irods/setup_irods_provider.json
+  ansible.builtin.command: python3 /var/lib/irods/scripts/setup_irods.py --json_configuration_file=/etc/irods/setup_irods_provider.json
   args:
     creates: /etc/irods/service_account.config
   run_once: true

diff --git a/roles/irods_icat/templates/setup_irods_provider.json.j2 b/roles/irods_icat/templates/setup_irods_provider.json.j2
@@ -50,6 +50,9 @@
     "default_resource_name": "{{ irods_default_resc }}",
     "environment_variables": {},
     "federation": [],
+    "host_resolution": {
+      "host_entries": []
+    },
     "match_hash_policy": "compatible",
     "negotiation_key": "{{ irods_negotiation_key }}",
     "plugin_configuration": {
@@ -113,5 +116,6 @@
     "zone_name": "{{ irods_zone }}",
     "zone_port": {{ irods_icat_port }},
     "zone_user": "rods"
-  }
+  },
+  "default_resource_name": "{{ irods_default_resc }}"
 }
diff --git a/roles/postgresql_odbc/tasks/setup-debian.yml b/roles/postgresql_odbc/tasks/setup-debian.yml
@@ -6,5 +6,6 @@
   ansible.builtin.package:
     name:
       - unixodbc
+      - unixodbc-dev
       - odbcinst
     state: present
diff --git a/roles/postgresql_odbc/tasks/setup-redhat.yml b/roles/postgresql_odbc/tasks/setup-redhat.yml
@@ -14,5 +14,6 @@
     name:
       - "postgresql{{ pgsql_version }}-odbc"
       - unixODBC
+      - unixODBC-devel
     state: present
   when: not ansible_check_mode