Skip to content

Commit

Permalink
Remove remaining references to CentOS/RHEL7
Browse files Browse the repository at this point in the history
  • Loading branch information
sbesson committed Apr 11, 2024
1 parent 3cf52ec commit f55e878
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
4 changes: 0 additions & 4 deletions ansible/molecule/ftp/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ provisioner:
docker-hosts:
# This should allow docker-in-docker to work
docker_storage_driver: vfs
# Versions 17.12.1.ce-1.el7.centos to latest (18.09.0-3.el7.x86_64)
# have a bug that prevents testing on travis:
# https://github.com/docker/for-linux/issues/219
docker_version: 17.09.1.ce-1.el7.centos
idr-ftp-hosts:
# Override configuration for testing
anonymous_ftp_emails:
Expand Down
2 changes: 1 addition & 1 deletion ansible/vars/openstack-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ idr_environment_idr: idr
# REQUIRED: List of public SSH keys
idr_keypair_keys:
# Change these to match the image and flavours in your OpenStack cloud
vm_image: CentOS 7
vm_image: Rocky Linux 9
vm_flavour: m1.large
vm_flavour_large: m1.xlarge
vm_flavour_medium: m1.medium
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Deploying the IDR

The IDR runs on CentOS 7 64-bit servers only.
The IDR runs on Rocky Linux 9 64-bit servers only.


## Overview of the playbooks
Expand Down Expand Up @@ -63,7 +63,7 @@ If you are using a static inventory run:

If you provisioned your servers using the OpenStack playbook and are using the IDR dynamic inventory run:

ansible-playbook -i ../inventories/openstack-idr.py --diff -u centos idr-00-preinstall.yml idr-01-install-idr.yml idr-02-services.yml idr-03-postinstall.yml
ansible-playbook -i ../inventories/openstack-idr.py --diff -u rocky idr-00-preinstall.yml idr-01-install-idr.yml idr-02-services.yml idr-03-postinstall.yml

If this completes successfully you should be able to access a public OMERO.web at the IP of the `idr-proxy` server.
If an update requires a reboot of a server the Ansible connection will be interrupted.
Expand Down
2 changes: 1 addition & 1 deletion docs/idr-ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ ansible-playbook -i ../inventories/openstack-idr.py --diff openstack-create-infr
# Security risk, only enable this when you setup a server with a new SSH key
export ANSIBLE_HOST_KEY_CHECKING=False
export OS_PROXY_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
ansible-playbook -i ../inventories/openstack-idr.py --diff -u centos idr-00-preinstall.yml idr-01-install-idr.yml idr-03-postinstall.yml
ansible-playbook -i ../inventories/openstack-idr.py --diff -u rokcy idr-00-preinstall.yml idr-01-install-idr.yml idr-03-postinstall.yml
2 changes: 1 addition & 1 deletion docs/operating-procedures.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ The following directories are not essential but you may wish to also back them u
If you used the OpenStack provisioning playbook, these are all separate volumes that can be backed up using the OpenStack clients.

### Restoration
If you need to restore the IDR, it is sufficient to restore these directories into a clean CentOS 7 server before running the deployment playbooks, which will take the existing data into account when installing the IDR.
If you need to restore the IDR, it is sufficient to restore these directories into a clean Rocky Linux 9 server before running the deployment playbooks, which will take the existing data into account when installing the IDR.
The OpenStack provisioning playbook includes optional parameters to specify existing volumes to be copied.

### New releases
Expand Down
4 changes: 2 additions & 2 deletions docs/provisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ In particular, you must define a list of SSH public key(s), for example:

- idr_keypair_keys: ["ssh-rsa SSH_PUBLIC_KEY"]

You must have a [CentOS 7 cloud image](https://cloud.centos.org/centos/7/images/) (or equivalent) available.
You must have a [Rocky Linux 9 cloud image](https://rockylinux.org/cloud-images/) (or equivalent) available.

Ensure you can login to OpenStack from the command line using [an OpenStack RC file](http://docs.openstack.org/user-guide/common/cli-set-environment-variables-using-openstack-rc.html) or equivalent, and run:

Expand All @@ -82,7 +82,7 @@ This will be fixed when the `openstack` command-line client supports this featur
## Other platforms

You should be able to install the IDR on other clouds or physical hardware by provisioning the resources yourself.
All servers must be running CentOS 7.
All servers must be running Rocky Linux 9.
An example static inventory is included in [`inventories/ansible-hosts`](../inventories/ansible-hosts).

For a minimal install you must have one host in each of:
Expand Down

0 comments on commit f55e878

Please sign in to comment.