Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocky Linux 9 IDR upgrade #413

Merged
merged 25 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9bc047f
Initial changes to deploy IDR systems on Rocky Linux 9
sbesson Dec 29, 2023
8004424
Remove ome.python_pydata role requirement
sbesson Dec 30, 2023
1e2503c
Bump plugins
sbesson Dec 31, 2023
42ec15e
Remove python36
sbesson Dec 31, 2023
ef69ae5
Merge remote-tracking branch 'origin/master' into rocky9
sbesson Feb 28, 2024
be5d500
Add second round of Ansible role version bumps
sbesson Feb 28, 2024
1de454a
Remove minio S3 gateway deployment
sbesson Feb 28, 2024
bf70a02
Try to fix FTP port Molecule tests
sbesson Feb 28, 2024
d7ea4a8
Update variables for ome.omero_server and ome.omero_web
sbesson Feb 29, 2024
9266c36
Use version 0.5.4 of the search engine
sbesson Mar 4, 2024
15d9ecd
Point at development branches of roles with permission fixes
sbesson Mar 4, 2024
75a046a
Bump prometheus_exporter version
dominikl Mar 7, 2024
19f3a00
Install python3-docker
sbesson Mar 8, 2024
3de09a4
Do not disabled uninstalled firewalld
sbesson Mar 12, 2024
f4221d0
Point to development versions of the roles
sbesson Mar 13, 2024
5fb1fcf
Bump OMERO.web to latest 5.25.0 release
sbesson Mar 18, 2024
867e63a
Point to development branch of ome.prometheus
sbesson Mar 18, 2024
e75e5aa
Also bump ome.omero_web_django_prometheus role
sbesson Mar 18, 2024
2802bc4
Deploy OMERO.mapr 0.5.2 with Django 4.2 support
sbesson Mar 18, 2024
35a1e66
Deploy OMERO.iviewer 0.13.0 with Django 4.2 support
sbesson Mar 18, 2024
4fc6810
Deploy OMERO.figure 6.2.0 with Django 4.2 support
sbesson Mar 18, 2024
7b43312
Consume released roles
sbesson Mar 20, 2024
4d07d97
Also bump ome.prometheus_jmx and ome.prometheus_node
sbesson Mar 20, 2024
3127f82
Use omero-metadata 0.12.0
sbesson Apr 3, 2024
8fe59d9
Bump ome.omero_web and ome.selinux_utils to latest tags
sbesson Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
upgrade_distpackages_excludes:
- "docker*"
iptables_raw_disable_firewalld: False
17 changes: 8 additions & 9 deletions ansible/group_vars/omero-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -83,11 +83,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.12.0
- omero-upload==0.4.0
- omero-rois==0.3.0
- pandas==1.1.0

omero_server_config_set:
omero.db.poolsize: 25
Expand All @@ -110,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

Expand Down Expand Up @@ -163,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
Expand Down Expand Up @@ -237,10 +236,10 @@ omero_web_config_set:
# Plugins and additional web configuration

omero_web_apps_packages:
- omero-mapr==0.5.1
- omero-iviewer==0.11.3
- 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
Expand Down
2 changes: 1 addition & 1 deletion ansible/group_vars/searchengine-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ansible/idr-02-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

### Ingress services
- import_playbook: idr-ftp.yml
- import_playbook: idr-s3gateway.yml

### Export services
- import_playbook: idr-export.yml
Expand Down
4 changes: 2 additions & 2 deletions ansible/idr-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion ansible/idr-omero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions ansible/idr-proxy-about.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
74 changes: 0 additions & 74 deletions ansible/idr-s3gateway.yml

This file was deleted.

7 changes: 5 additions & 2 deletions ansible/molecule/ftp/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/molecule/ftp/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
60 changes: 36 additions & 24 deletions ansible/molecule/publicidr/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Loading
Loading