Merge pull request #612 from scimerman/irods_and_davrods

Irods and davrods: bigger update #3
rug-cit-hpc · Sep 2, 2022 · 10eca2a · 10eca2a
2 parents 2fec902 + 84dbe57
commit 10eca2a
Show file tree

Hide file tree

Showing 25 changed files with 948 additions and 285 deletions.
diff --git a/files/nibbler_cluster/nemi_irods/README.md b/files/nibbler_cluster/nemi_irods/README.md
@@ -336,6 +336,12 @@ openssl dhparam -2 -out dhparams.pem 2048
 
 #### DEBUGGING
 
+Viewing irods log file in new >4.3.0 json format
+```bash
+   $ sudo jq '[.server_timestamp,.log_message] | join(" ")' /var/log/irods/irods.log | tail -n 15
+
+```
+
 * irods service
   to start/restart/stop irods service, use  
   `service irods restart`  
@@ -355,8 +361,8 @@ net.ipv4.tcp_keepalive_probes = 6
 ```
 
 * check logs
-```
-tail -50 /var/lib/irods/log/rods.Log.2021...
+```bash
+   $ tail -50 /var/lib/irods/log/rods.Log.2021...
 ```
 
 * restart service

diff --git a/group_vars/irods.yml b/group_vars/irods.yml
@@ -14,42 +14,42 @@ iptables_allow_irods:
   - ANY
 iptables_allow_postgresql_outbound:
   - ANY
+
+ir_server_type: 'icat'                     # iRODS Server Type
+ir_yum_packages: '{{ ir_yum_packages_4_3_0 }}' # Picked version of packages (defined in role defaults)
 ssh_host_signer_hostnames: "{{ ansible_fqdn }},{{ ansible_hostname }},{{ inventory_hostname }}\
   {% for host in groups['jumphost'] %},{{ host }}+{{ ansible_hostname }}{% endfor %}\
   {% for host in groups['jumphost'] %},{{ host }}+{{ inventory_hostname }}{% endfor %}"
-ir_version: '-4.2.11*'                  # if defined (empty): version will be installed (must start with '-' and end with '*')
-ir_server_type: 'icat'                  # iRODS Server Type
-ir_client_server_policy: 'CS_NEG_REQUIRE'  # communicating using SSL (CS_NEG_REQUIRE) or without (CS_NEG_REFUSE
 
+ir_client_server_policy: 'CS_NEG_REQUIRE'  # communicating using SSL (CS_NEG_REQUIRE) or without (CS_NEG_REFUSE
 ir_ssl_certificate_chain_file: 'nemi_irods/localhost_and_chain_umcg-icat01.crt' # iRODS server certificate
 ir_ssl_certificate_key_file: 'nemi_irods/localhost-umcg01.key' # iRODS server certificate's key
-ir_ssl_dh_params_file: 'dhparams.pem'   # DHparam filename 
+ir_ssl_dh_params_file: 'dhparams.pem'      # DHparam filename 
 
-ir_zone: 'nlumcg'                       # default main iRODS zone name
-ir_local_res: 'rootResc'                # local iRODS resource
-ir_vault_path: '/var/lib/irods/Vault'   # default path to store files for local resource
-ir_default_res: 'surfObjStore'          # default resource iRODS uploads to
-ir_service_account: 'irods'             # linux account under which iRODS runs
-ir_admin_name: 'rods'                   # iRODS (and zone) account
+ir_service_account: 'irods'                # iRODS linux account under which iRODS runs
+ir_service_account_home: '/home/{{ ir_service_account }}' # iRODS service account user's home folder
+ir_admin_name: 'rods'                      # iRODS (and zone) account
+ir_admin_pwd: '{{ icatV_admin_pwd }}'      # iRODS Vaulte main administrator password
 ir_admin_home_path: '/{{ ir_zone }}/home/{{ ir_admin_name }}' # iRODS admin's home path
-ir_db_user: '{{ ir_service_account }}'  # db Username, usually same as irods_service_account
-ir_db_server: '{{ icat_db_server }}'    # iRODS Database Server
-ir_db_name: 'ICAT'                      # iRODS Database Name
-ir_negotiation_key: '{{ icat_negotiation_key }}'
-ir_ctrl_plane_key: '{{ icat_ctrl_plane_key }}'
-ir_zone_key: '{{ icat_zone_key }}'
-ir_salt: '{{ icat_salt }}'              # iRODS salt
+ir_salt: '{{ icatV_salt }}'                # iRODS Vaulted salt
+ir_zone: 'nlumcg'                          # iRODS default main iRODS zone name
+ir_zone_key: '{{ icatV_zone_key }}'        # iRODS Vaulted zone key 
+ir_negotiation_key: '{{ icatV_negotiation_key }}' # iRODS Vaulted negotiation key
+ir_ctrl_plane_key: '{{ icatV_ctrl_plane_key }}' # iRODS Vaulted control plane key
+ir_local_res: 'rootResc'                   # iRODS local iRODS resource
+ir_vault_path: '/var/lib/irods/Vault'      # iRODS default path to store files for local resource
+ir_default_res: 'surfObjStore'             # iRODS default resource iRODS uploads to
 
-davrods_install: true                   # to install davrods docker
-davrods_docker_folder: 'davrods_docker' # davrods docker folder name, relative to the user home directory
+davrods_install: true                      # to install davrods docker
+davrods_docker_folder: 'davrods_docker'    # davrods docker folder name, relative to the user home directory
 davrods_default_resource: '{{ ir_default_res }}' # default resource to upload files via davrods
 
-tiering_install: False                  # True / False
-ir_local_stage_res: 'demoRescStaging'   # Staging resource, before data moved to permanent resource
+tiering_install: False                     # True / False
+ir_local_stage_res: 'demoRescStaging'      # Staging resource, before data moved to permanent resource
 ir_local_stage_res_fol: '/tmp/irods/{{ ir_local_stage_res }}' # optional, only if it is local resource
-ir_local_perm_res: 'demoRescPerm'       # Permanent resource, where it will keep data indefinitely
+ir_local_perm_res: 'demoRescPerm'          # Permanent resource, where it will keep data indefinitely
 ir_local_perm_res_fol: '/tmp/irods/{{ ir_local_perm_res }}' # optional, only if it is local resource
 
-pgsql_server: "local"                   # "local" or "remote" PostgreSQL server
+pgsql_server: "local"                      # "local" or "remote" PostgreSQL server
 remote_psql_server_ca: "nemi_irods/remote_psql_server_ca.crt"   # (optional) remote servers's CA certificate
 ...
diff --git a/group_vars/nibbler_cluster/ip_addresses.yml b/group_vars/nibbler_cluster/ip_addresses.yml
@@ -19,6 +19,13 @@ ip_addresses:
     nb_internal_management_13:
       address: 10.10.3.17
       netmask: /32
+  irods-test-db:
+    nb_internal_management:
+      address: 10.10.1.114
+      netmask: /32
+    nb_internal_management_13:
+      address: 10.10.3.97
+      netmask: /32
   nb-dai:
     nb_internal_management:
       address: 10.10.1.75