From 9bc047fa06b5123656b5ade1859d5f762dbf7b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 29 Dec 2023 22:57:03 +0000 Subject: [PATCH 01/24] Initial changes to deploy IDR systems on Rocky Linux 9 - bump all Ansible roles to their latest versions - update Molecule infrastructure to use Rocky Linux 9 image --- .github/workflows/molecule.yml | 4 +- ansible/molecule/ftp/molecule.yml | 7 ++- ansible/molecule/publicidr/molecule.yml | 60 +++++++++++++++---------- ansible/requirements.yml | 46 +++++++++---------- 4 files changed, 66 insertions(+), 51 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 98c63c5e..d13fa948 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -8,7 +8,7 @@ on: jobs: list-scenarios: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.listscenarios.outputs.scenarios }} steps: @@ -22,7 +22,7 @@ jobs: name: Test needs: - list-scenarios - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: # Keep running so we can see if other tests pass fail-fast: false diff --git a/ansible/molecule/ftp/molecule.yml b/ansible/molecule/ftp/molecule.yml index bd9ccba2..b3655628 100644 --- a/ansible/molecule/ftp/molecule.yml +++ b/ansible/molecule/ftp/molecule.yml @@ -14,9 +14,12 @@ lint: | platforms: - name: idr-ftp - image: centos/systemd:latest + image: eniocarboni/docker-rockylinux-systemd:9 command: /sbin/init - privileged: True + privileged: true + cgroupns_mode: host + tmpfs: + - /sys/fs/cgroup groups: - idr-ftp-hosts - ftp-hosts diff --git a/ansible/molecule/publicidr/molecule.yml b/ansible/molecule/publicidr/molecule.yml index 8f098f7b..4cfb528a 100644 --- a/ansible/molecule/publicidr/molecule.yml +++ b/ansible/molecule/publicidr/molecule.yml @@ -14,24 +14,30 @@ lint: | platforms: - name: idr-database-docker - image: centos/systemd:latest + image: eniocarboni/docker-rockylinux-systemd:9 command: /sbin/init - privileged: True + privileged: true + cgroupns_mode: host + tmpfs: + - /sys/fs/cgroup groups: - - idr-database-hosts - - database-hosts - - idr-hosts + - idr-database-hosts + - database-hosts + - idr-hosts - name: idr-omeroreadwrite-docker - image: centos/systemd:latest + image: eniocarboni/docker-rockylinux-systemd:9 command: /sbin/init - privileged: True + privileged: true + cgroupns_mode: host + tmpfs: + - /sys/fs/cgroup groups: - - idr-omero-hosts - - omero-hosts - - idr-omeroreadwrite-hosts - - omeroreadwrite-hosts - - idr-hosts + - idr-omero-hosts + - omero-hosts + - idr-omeroreadwrite-hosts + - omeroreadwrite-hosts + - idr-hosts ###################################################################### # WARNING: @@ -43,24 +49,30 @@ platforms: # TODO: Test idr-omero-readonly.yml ###################################################################### - name: idr-omeroreadonly-docker - image: centos/systemd:latest + image: eniocarboni/docker-rockylinux-systemd:9 command: /sbin/init - privileged: True + privileged: true + cgroupns_mode: host + tmpfs: + - /sys/fs/cgroup groups: - - idr-omero-hosts - - omero-hosts - - idr-omeroreadonly-hosts - - omeroreadonly-hosts - - idr-hosts + - idr-omero-hosts + - omero-hosts + - idr-omeroreadonly-hosts + - omeroreadonly-hosts + - idr-hosts - name: idr-proxy-docker - image: centos/systemd:latest + image: eniocarboni/docker-rockylinux-systemd:9 command: /sbin/init - privileged: True + privileged: true + cgroupns_mode: host + tmpfs: + - /sys/fs/cgroup groups: - - idr-proxy-hosts - - proxy-hosts - - idr-hosts + - idr-proxy-hosts + - proxy-hosts + - idr-hosts provisioner: name: ansible diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 3dda9e44..452995dd 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -13,19 +13,19 @@ version: 0.1.4 - src: ome.basedeps - version: 1.1.0 + version: 1.3.1 - src: ome.cadvisor - version: 0.3.3 + version: 0.4.0 - src: ome.cli_utils - version: 1.1.1 + version: 1.2.1 - src: ome.deploy_archive - version: 0.1.4 + version: 0.2.0 - src: ome.docker - version: 3.1.1 + version: 3.2.0 - src: ome.docker_tools version: 1.0.1 @@ -37,13 +37,13 @@ version: 0.2.3 - src: ome.ice - version: 4.3.0 + version: 4.4.1 - src: ome.iptables_raw - version: 0.3.1 + version: 0.4.0 - src: ome.java - version: 2.1.0 + version: 2.2.0 - src: ome.local_accounts version: 1.1.0 @@ -52,7 +52,7 @@ version: 1.0.2 - src: ome.lvm_partition - version: 1.1.1 + version: 1.2.0 - src: ome.minio_s3_gateway version: 0.1.1 @@ -70,37 +70,37 @@ version: 1.0.4 - src: ome.nginx - version: 2.1.2 + version: 2.2.0 - src: ome.nginx_proxy - version: 1.15.1 + version: 1.15.2 - src: ome.omero_common - version: 0.3.4 + version: 0.4.0 - src: ome.omero_logmonitor version: 3.0.1 - src: ome.omero_server - version: 4.1.0 + version: 6.0.0 - name: ome.omero_user version: 0.3.1 - src: ome.omero_web - version: 4.0.1 + version: 5.0.0 - name: ome.openstack_volume_storage version: 2.0.0 - src: ome.postgresql - version: 5.2.0 + version: 5.3.1 - src: ome.postgresql_client - version: 0.2.0 + version: 0.4.0 - src: ome.python3_virtualenv - version: 0.1.2 + version: 0.2.0 - src: ome.python_pydata version: 1.1.1 @@ -109,13 +109,13 @@ version: 0.1.3 - src: ome.redis - version: 1.1.1 + version: 1.2.0 - src: ome.selinux_utils - version: 2.0.2 + version: 2.1.0 - src: ome.ssl_certificate - version: 0.3.3 + version: 0.4.0 - src: ome.storage_volume_initialise version: 1.0.2 @@ -127,7 +127,7 @@ version: 1.1.3 - src: ome.versioncontrol_utils - version: 1.0.2 + version: 1.1.0 ###################################################################### @@ -153,7 +153,7 @@ # External development roles - src: ome.fluentd - version: 0.2.3 + version: 0.3.1 - src: ome.omero_prometheus_exporter version: 0.3.6 @@ -171,4 +171,4 @@ version: 0.3.1 - src: ome.prometheus_postgres - version: 0.4.2 + version: 0.5.0 From 8004424c1cd3f2bc62f143969aa56b7348dcee7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sat, 30 Dec 2023 16:56:47 +0000 Subject: [PATCH 02/24] Remove ome.python_pydata role requirement --- ansible/idr-omero.yml | 1 - ansible/requirements.yml | 3 --- 2 files changed, 4 deletions(-) diff --git a/ansible/idr-omero.yml b/ansible/idr-omero.yml index 3827c98e..ceaa0090 100644 --- a/ansible/idr-omero.yml +++ b/ansible/idr-omero.yml @@ -48,7 +48,6 @@ roles: - role: ome.basedeps - role: ome.versioncontrol_utils - - role: ome.python_pydata - role: ome.analysis_tools - hosts: "{{ idr_environment | default('idr') }}-omeroreadwrite-hosts" diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 452995dd..adba89ae 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -102,9 +102,6 @@ - src: ome.python3_virtualenv version: 0.2.0 -- src: ome.python_pydata - version: 1.1.1 - - src: ome.reboot_server version: 0.1.3 From 1e2503ce413ef3e3c9a75689844946ecb4e18b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sun, 31 Dec 2023 13:53:53 +0000 Subject: [PATCH 03/24] Bump plugins --- ansible/group_vars/omero-hosts.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 99819b4a..3eaf3661 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -57,11 +57,10 @@ omero_server_datadir_bioformatscache: /data/BioFormatsCache omero_server_systemd_limit_nofile: 16384 omero_server_python_addons: -- omero-cli-render==0.7.0 -- omero-metadata==0.9.0 +- omero-cli-render==0.8.0 +- omero-metadata==0.11.0 - omero-upload==0.4.0 - omero-rois==0.3.0 -- pandas==1.1.0 omero_server_config_set: omero.db.poolsize: 25 From 42ec15e0143f465883f4ef4dc377078b30db25be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sun, 31 Dec 2023 14:11:03 +0000 Subject: [PATCH 04/24] Remove python36 --- ansible/idr-proxy-about.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ansible/idr-proxy-about.yml b/ansible/idr-proxy-about.yml index f3ef6082..aa35a03e 100644 --- a/ansible/idr-proxy-about.yml +++ b/ansible/idr-proxy-about.yml @@ -3,12 +3,6 @@ - hosts: "{{ idr_environment | default('idr') }}-proxy-hosts" tasks: - - name: Install Python 3 - become: true - yum: - name: python36 - state: present - - name: Create static directory become: yes file: From be5d5006d51a614aa10bbd76d0b54bcf1983b5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 28 Feb 2024 16:45:32 +0000 Subject: [PATCH 05/24] Add second round of Ansible role version bumps --- ansible/requirements.yml | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index adba89ae..5c785e49 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -7,16 +7,16 @@ # are managed by this file and not the role - src: ome.analysis_tools - version: 1.0.1 + version: 1.1.0 - name: ome.anonymous_ftp - version: 0.1.4 + version: 0.2.0 - src: ome.basedeps version: 1.3.1 - src: ome.cadvisor - version: 0.4.0 + version: 0.5.0 - src: ome.cli_utils version: 1.2.1 @@ -25,7 +25,7 @@ version: 0.2.0 - src: ome.docker - version: 3.2.0 + version: 3.2.1 - src: ome.docker_tools version: 1.0.1 @@ -34,10 +34,10 @@ version: 3.2.3 - src: ome.hosts_populate - version: 0.2.3 + version: 0.3.0 - src: ome.ice - version: 4.4.1 + version: 4.4.2 - src: ome.iptables_raw version: 0.4.0 @@ -46,7 +46,7 @@ version: 2.2.0 - src: ome.local_accounts - version: 1.1.0 + version: 1.2.0 - src: ome.logrotate version: 1.0.2 @@ -58,70 +58,70 @@ version: 0.1.1 - name: ome.network_cloud_interfaces - version: 1.2.4 + version: 1.3.0 - src: ome.network - version: 1.1.4 + version: 1.2.0 - src: ome.nfs_mount - version: 1.3.0 + version: 1.4.0 - src: ome.nfs_share - version: 1.0.4 + version: 1.1.0 - src: ome.nginx version: 2.2.0 - src: ome.nginx_proxy - version: 1.15.2 + version: 1.16.0 - src: ome.omero_common version: 0.4.0 - src: ome.omero_logmonitor - version: 3.0.1 + version: 3.1.0 - src: ome.omero_server version: 6.0.0 - name: ome.omero_user - version: 0.3.1 + version: 0.4.0 - src: ome.omero_web - version: 5.0.0 + version: 5.1.0 - name: ome.openstack_volume_storage version: 2.0.0 - src: ome.postgresql - version: 5.3.1 + version: 5.4.0 - src: ome.postgresql_client - version: 0.4.0 + version: 0.4.2 - src: ome.python3_virtualenv version: 0.2.0 - src: ome.reboot_server - version: 0.1.3 + version: 0.2.0 - src: ome.redis - version: 1.2.0 + version: 1.3.0 - src: ome.selinux_utils version: 2.1.0 - src: ome.ssl_certificate - version: 0.4.0 + version: 0.5.0 - src: ome.storage_volume_initialise - version: 1.0.2 + version: 1.1.0 - src: ome.sudoers - version: 1.0.4 + version: 1.1.0 - src: ome.upgrade_distpackages - version: 1.1.3 + version: 1.2.0 - src: ome.versioncontrol_utils version: 1.1.0 From 1de454a72df4aff7486e30bc850274e025f6c4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 28 Feb 2024 17:05:33 +0000 Subject: [PATCH 06/24] Remove minio S3 gateway deployment --- ansible/idr-02-services.yml | 1 - ansible/idr-s3gateway.yml | 74 ------------------------------------- ansible/requirements.yml | 3 -- 3 files changed, 78 deletions(-) delete mode 100644 ansible/idr-s3gateway.yml diff --git a/ansible/idr-02-services.yml b/ansible/idr-02-services.yml index 4755ba13..e112624f 100644 --- a/ansible/idr-02-services.yml +++ b/ansible/idr-02-services.yml @@ -2,7 +2,6 @@ ### Ingress services - import_playbook: idr-ftp.yml -- import_playbook: idr-s3gateway.yml ### Export services - import_playbook: idr-export.yml diff --git a/ansible/idr-s3gateway.yml b/ansible/idr-s3gateway.yml deleted file mode 100644 index 1097fd24..00000000 --- a/ansible/idr-s3gateway.yml +++ /dev/null @@ -1,74 +0,0 @@ -# IDR submission S3 gateway server - -- hosts: "{{ idr_environment | default('idr') }}-ftp-hosts" - - # Assumes docker is already installed (in idr-ftp.yml) - - roles: - - - role: ome.minio_s3_gateway - minio_s3_gateway_remote_endpoint: "{{ idr_s3_gateway_remote_endpoint }}" - minio_s3_gateway_bucket: "{{ idr_minio_s3_gateway_bucket | default('example') }}" - minio_s3_gateway_access_key: "{{ idr_secret_minio_s3_gateway_access_key | default('minio') }}" - minio_s3_gateway_secret_key: "{{ idr_secret_minio_s3_gateway_secret_key | default('minio123') }}" - minio_s3_gateway_placeholder_content: > - Please upload your IDR submission here and email - idr@openmicroscopy.org when ready. - - # Default to a self-signed certificate - # To use production certificates see - # https://github.com/ome/ansible-role-ssl-certificate/blob/0.3.2/README.md - - role: ome.ssl_certificate - - role: ome.nginx_proxy - nginx_stable_repo: true - nginx_proxy_worker_processes: 4 - nginx_proxy_ssl: true - nginx_proxy_ssl_certificate: /etc/ssl/localcerts/bundled.crt - nginx_proxy_ssl_certificate_key: /etc/ssl/localcerts/server.key - nginx_proxy_http2: true - nginx_proxy_force_ssl: true - # nginx_proxy_hsts_age: 31536000 - nginx_proxy_sites: - # idr-ftp.openmicroscopy.org: S3 read-write /idr-upload only - - nginx_proxy_server_name: idr-ftp.openmicroscopy.org - nginx_proxy_backends: - - name: s3gateway - location: "~ ^/{{ idr_minio_s3_gateway_bucket | default('example') }}(/.*)?$" - server: "http://localhost:9000" - # Disable buffering and allow unlimited file sizes - # https://serverfault.com/a/818090 - nginx_proxy_additional_directives: - - client_max_body_size 0 - - proxy_http_version 1.1 - - proxy_request_buffering off - - proxy_buffering off - # idr-s3.openmicroscopy.org: S3 read-only public /idr with CORS - # other buckets can be added - - nginx_proxy_server_name: idr-s3.openmicroscopy.org - nginx_proxy_backends: - - name: s3-embassy-idr - location: "~ ^/idr(/.*)?$" - server: "{{ idr_s3_gateway_remote_endpoint }}" - # Disable buffering - # https://serverfault.com/a/818090 - nginx_proxy_additional_directives: - - proxy_http_version 1.1 - - proxy_request_buffering off - - proxy_buffering off - # all other hostnames: redirect to https://idr.openmicroscopy.org/ - - nginx_proxy_is_default: True - nginx_proxy_direct_locations: - - location: / - redirect302: "https://idr.openmicroscopy.org/" - - handlers: - - - name: restart nginx when certificates changed - listen: ssl certificate changed - become: yes - service: - name: nginx - state: restarted - - vars: - idr_s3_gateway_remote_endpoint: "https://s3.embassy.ebi.ac.uk" diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 5c785e49..e8d73182 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -54,9 +54,6 @@ - src: ome.lvm_partition version: 1.2.0 -- src: ome.minio_s3_gateway - version: 0.1.1 - - name: ome.network_cloud_interfaces version: 1.3.0 From bf70a0201a0e38d58d939ae5cdc74dac1cb2dad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 28 Feb 2024 17:26:34 +0000 Subject: [PATCH 07/24] Try to fix FTP port Molecule tests --- ansible/molecule/ftp/tests/test_default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/molecule/ftp/tests/test_default.py b/ansible/molecule/ftp/tests/test_default.py index cdebd20c..d058df36 100644 --- a/ansible/molecule/ftp/tests/test_default.py +++ b/ansible/molecule/ftp/tests/test_default.py @@ -12,7 +12,7 @@ 32222, ]) def test_listening(host, port): - assert host.socket('tcp://%d' % port).is_listening + assert host.socket('tcp://0.0.0.0:%d' % port).is_listening def test_upload(host): From d7ea4a84ee9d59b6286fd0c8f3c48accd776bf4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 29 Feb 2024 08:44:02 +0000 Subject: [PATCH 08/24] Update variables for ome.omero_server and ome.omero_web - omero_server_selfsigned_certificates is True by default - omero_web_setup_redis_session should install django-redis --- ansible/group_vars/omero-hosts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index b14abe5f..492e1d0f 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -109,8 +109,6 @@ omero_server_config_set: # Disable all components except Blitz and Tables omero.server.nodedescriptors: "master:Blitz-0,Tables-0" -omero_server_selfsigned_certificates: True - ###################################################################### # Other dependent role vars @@ -162,6 +160,8 @@ idr_omero_web_public_url_filters: omero_web_release: "{{ idr_omero_web_release }}" +omero_web_setup_redis_session: true + omero_web_config_set: # web omero.web.api.max_limit: 1000 From 9266c36fd79ac2a3bc666fc0cf2cbd4e187a6459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 4 Mar 2024 15:55:57 +0000 Subject: [PATCH 09/24] Use version 0.5.4 of the search engine --- ansible/group_vars/searchengine-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/searchengine-hosts.yml b/ansible/group_vars/searchengine-hosts.yml index 3b805629..7da74106 100644 --- a/ansible/group_vars/searchengine-hosts.yml +++ b/ansible/group_vars/searchengine-hosts.yml @@ -6,7 +6,7 @@ database_username: omeroreadonly database_user_password: "{{ idr_secret_postgresql_password_ro | default('omero') }}" searchenginecache_folder: /data/searchengine/searchengine/cacheddata/ search_engineelasticsearch_docker_image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1 -searchengine_docker_image: openmicroscopy/omero-searchengine:0.5.3 +searchengine_docker_image: openmicroscopy/omero-searchengine:0.5.4 #ansible_python_interpreter: path/to/bin/python searchengine_index: searchengine_index cache_rows: 100000 From 15d9ecdf8bc78e820b6783d38d649a0be14fbba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 4 Mar 2024 15:58:14 +0000 Subject: [PATCH 10/24] Point at development branches of roles with permission fixes --- ansible/requirements.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index e8d73182..da9ae509 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -18,8 +18,9 @@ - src: ome.cadvisor version: 0.5.0 -- src: ome.cli_utils - version: 1.2.1 +- name: ome.cli_utils + src: https://github.com/ome/ansible-role-cli-utils/archive/0ec461e45cda300100500a8ff630d616b1f8d1bc.tar.gz + version: 1.2.2 - src: ome.deploy_archive version: 0.2.0 @@ -93,8 +94,9 @@ - src: ome.postgresql version: 5.4.0 -- src: ome.postgresql_client - version: 0.4.2 +- name: ome.postgresql_client + src: https://github.com/ome/ansible-role-postgresql-client/archive/327a9216c37f56eb5e6cc328ddbe6cca86a2564a.tar.gz + version: 0.4.3 - src: ome.python3_virtualenv version: 0.2.0 From 75a046a7c9347b437880bd38f6e0d46c93a68736 Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Thu, 7 Mar 2024 15:26:39 +0000 Subject: [PATCH 11/24] Bump prometheus_exporter version --- ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index da9ae509..00d261b8 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -152,7 +152,7 @@ version: 0.3.1 - src: ome.omero_prometheus_exporter - version: 0.3.6 + version: 0.4.0 - src: ome.omero_web_django_prometheus version: 0.4.1 From 19f3a0015d16f1223bc8547dbff55369a46007d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 8 Mar 2024 10:49:38 +0000 Subject: [PATCH 12/24] Install python3-docker --- ansible/idr-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/idr-docker.yml b/ansible/idr-docker.yml index e87fc6ab..abfa5ddd 100644 --- a/ansible/idr-docker.yml +++ b/ansible/idr-docker.yml @@ -8,8 +8,8 @@ docker_use_ipv4_nic_mtu: True docker_version: 24.0.7 tasks: - - name: install docker-python + - name: install python3-docker become: yes yum: - name: docker-python + name: python3-docker state: present From 3de09a4010804769697f1888f6a4b16bd4a20d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Tue, 12 Mar 2024 12:17:53 +0000 Subject: [PATCH 13/24] Do not disabled uninstalled firewalld --- ansible/group_vars/all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index eb746457..acf98689 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1,2 +1,3 @@ upgrade_distpackages_excludes: - "docker*" +iptables_raw_disable_firewalld: False From f4221d0492d8fb8fb5d4f31a66f5a8d53fefeb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 13 Mar 2024 08:58:03 +0000 Subject: [PATCH 14/24] Point to development versions of the roles --- ansible/requirements.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 00d261b8..155994eb 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -25,8 +25,9 @@ - src: ome.deploy_archive version: 0.2.0 -- src: ome.docker - version: 3.2.1 +- name: ome.docker + src: https://github.com/ome/ansible-role-docker/archive/20a0c275dabc0873da9259881256abb5a417104a.tar.gz + version: 3.2.2 - src: ome.docker_tools version: 1.0.1 @@ -37,8 +38,9 @@ - src: ome.hosts_populate version: 0.3.0 -- src: ome.ice - version: 4.4.2 +- name: ome.ice + src: https://github.com/ome/ansible-role-ice/archive/e4b876d1445c9dd1e746002167b09bfed45101e4.tar.gz + version: 4.4.3 - src: ome.iptables_raw version: 0.4.0 @@ -67,8 +69,9 @@ - src: ome.nfs_share version: 1.1.0 -- src: ome.nginx - version: 2.2.0 +- name: ome.nginx + src: https://github.com/ome/ansible-role-nginx/archive/b07dc9f0c4ad2d5713c96136d41200bf5b2ef06a.tar.gz + version: 2.2.1 - src: ome.nginx_proxy version: 1.16.0 @@ -85,8 +88,9 @@ - name: ome.omero_user version: 0.4.0 -- src: ome.omero_web - version: 5.1.0 +- name: ome.omero_web + src: https://github.com/ome/ansible-role-omero-web/archive/1d62cd715ecba6bf9c83f851a610813d6906b1f7.tar.gz + version: 5.1.1 - name: ome.openstack_volume_storage version: 2.0.0 From 5fb1fcf7a619443e3134b639dc2e88ab08f92c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:33:58 +0000 Subject: [PATCH 15/24] Bump OMERO.web to latest 5.25.0 release --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 492e1d0f..7e53dcef 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -11,7 +11,7 @@ idr_omero_server_release: 5.6.0 omero_server_checkupgrade_comparator: '!=' -idr_omero_web_release: 5.21.0 +idr_omero_web_release: 5.25.0 # omero-web depends on omero-py but may not pin the latest release # omero_web_python_addons: # - omero-py==5.9.0 From 867e63ad0bcdc5f5c9e38d0238ce3166ec815652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:36:40 +0000 Subject: [PATCH 16/24] Point to development branch of ome.prometheus --- ansible/requirements.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 155994eb..6ba32046 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -161,8 +161,9 @@ - src: ome.omero_web_django_prometheus version: 0.4.1 -- src: ome.prometheus - version: 0.5.1 +- name: ome.prometheus + src: https://github.com/ome/ansible-role-prometheus/archive/7f21fc1a286adce3cf87f0a269a38c4cdf2098f8.tar.gz + version: 0.6.0 - name: ome.prometheus_jmx version: 0.3.1 From e75e5aab4d3b06df2b238eeeb08cedc5d682ac24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:53:08 +0000 Subject: [PATCH 17/24] Also bump ome.omero_web_django_prometheus role --- ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 6ba32046..c487e651 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -159,7 +159,7 @@ version: 0.4.0 - src: ome.omero_web_django_prometheus - version: 0.4.1 + version: 0.5.0 - name: ome.prometheus src: https://github.com/ome/ansible-role-prometheus/archive/7f21fc1a286adce3cf87f0a269a38c4cdf2098f8.tar.gz From 2802bc4502102f5b32a6131149823e920cc28f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:53:42 +0000 Subject: [PATCH 18/24] Deploy OMERO.mapr 0.5.2 with Django 4.2 support --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 7e53dcef..698187db 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -236,7 +236,7 @@ omero_web_config_set: # Plugins and additional web configuration omero_web_apps_packages: -- omero-mapr==0.5.1 +- omero-mapr==0.5.2 - omero-iviewer==0.11.3 - idr-gallery==3.11.0 - omero-figure==4.4.3 From 35a1e66f5baf82e7b7825d57c031e127825f3378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:55:06 +0000 Subject: [PATCH 19/24] Deploy OMERO.iviewer 0.13.0 with Django 4.2 support --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 698187db..2ef88aa2 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -237,7 +237,7 @@ omero_web_config_set: omero_web_apps_packages: - omero-mapr==0.5.2 -- omero-iviewer==0.11.3 +- omero-iviewer==0.13.0 - idr-gallery==3.11.0 - omero-figure==4.4.3 omero_web_apps_names: From 4fc68101bf0d40657e5883cdae87ce0e0c1ac5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 18 Mar 2024 10:55:18 +0000 Subject: [PATCH 20/24] Deploy OMERO.figure 6.2.0 with Django 4.2 support --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 2ef88aa2..f3ee6243 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -239,7 +239,7 @@ omero_web_apps_packages: - omero-mapr==0.5.2 - omero-iviewer==0.13.0 - idr-gallery==3.11.0 -- omero-figure==4.4.3 +- omero-figure==6.2.0 omero_web_apps_names: - omero_mapr - omero_iviewer From 7b433124fc5729c3df25d2071f06a9e875cf442e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 20 Mar 2024 22:54:43 +0000 Subject: [PATCH 21/24] Consume released roles --- ansible/requirements.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index c487e651..7fcdc688 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -19,14 +19,12 @@ version: 0.5.0 - name: ome.cli_utils - src: https://github.com/ome/ansible-role-cli-utils/archive/0ec461e45cda300100500a8ff630d616b1f8d1bc.tar.gz - version: 1.2.2 + version: 1.2.5 - src: ome.deploy_archive version: 0.2.0 - name: ome.docker - src: https://github.com/ome/ansible-role-docker/archive/20a0c275dabc0873da9259881256abb5a417104a.tar.gz version: 3.2.2 - src: ome.docker_tools @@ -39,8 +37,7 @@ version: 0.3.0 - name: ome.ice - src: https://github.com/ome/ansible-role-ice/archive/e4b876d1445c9dd1e746002167b09bfed45101e4.tar.gz - version: 4.4.3 + version: 4.4.4 - src: ome.iptables_raw version: 0.4.0 @@ -70,7 +67,6 @@ version: 1.1.0 - name: ome.nginx - src: https://github.com/ome/ansible-role-nginx/archive/b07dc9f0c4ad2d5713c96136d41200bf5b2ef06a.tar.gz version: 2.2.1 - src: ome.nginx_proxy @@ -99,7 +95,6 @@ version: 5.4.0 - name: ome.postgresql_client - src: https://github.com/ome/ansible-role-postgresql-client/archive/327a9216c37f56eb5e6cc328ddbe6cca86a2564a.tar.gz version: 0.4.3 - src: ome.python3_virtualenv @@ -162,8 +157,7 @@ version: 0.5.0 - name: ome.prometheus - src: https://github.com/ome/ansible-role-prometheus/archive/7f21fc1a286adce3cf87f0a269a38c4cdf2098f8.tar.gz - version: 0.6.0 + version: 0.6.1 - name: ome.prometheus_jmx version: 0.3.1 From 4d07d97af7ac1f28a61bb2f61b4ba15febd82d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 20 Mar 2024 22:59:27 +0000 Subject: [PATCH 22/24] Also bump ome.prometheus_jmx and ome.prometheus_node --- ansible/requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 7fcdc688..d52421bc 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -160,10 +160,10 @@ version: 0.6.1 - name: ome.prometheus_jmx - version: 0.3.1 + version: 0.4.0 - src: ome.prometheus_node - version: 0.3.1 + version: 0.4.0 - src: ome.prometheus_postgres version: 0.5.0 From 3127f82468cc19f2cf74151e7c62497bc9393095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 3 Apr 2024 11:33:44 +0100 Subject: [PATCH 23/24] Use omero-metadata 0.12.0 --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index f3ee6243..525e2505 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -84,7 +84,7 @@ omero_server_systemd_limit_nofile: 16384 omero_server_python_addons: - omero-cli-render==0.8.0 -- omero-metadata==0.11.0 +- omero-metadata==0.12.0 - omero-upload==0.4.0 - omero-rois==0.3.0 From 8fe59d9a749d7991aeabf55043fe92951b5a6577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Wed, 3 Apr 2024 13:56:59 +0100 Subject: [PATCH 24/24] Bump ome.omero_web and ome.selinux_utils to latest tags --- ansible/requirements.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index d52421bc..55fd6730 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -85,7 +85,6 @@ version: 0.4.0 - name: ome.omero_web - src: https://github.com/ome/ansible-role-omero-web/archive/1d62cd715ecba6bf9c83f851a610813d6906b1f7.tar.gz version: 5.1.1 - name: ome.openstack_volume_storage @@ -107,7 +106,7 @@ version: 1.3.0 - src: ome.selinux_utils - version: 2.1.0 + version: 2.1.1 - src: ome.ssl_certificate version: 0.5.0