Add rhel 10 support, combine workers+workers_gpu, remove jenkins, remove rhel 8 #111
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,6 +11,7 @@ galaxy_gid: 999 | |||||||||||
| replace_non_galaxy_999: true | ||||||||||||
|
|
||||||||||||
| telegraf_agent_package_state: latest | ||||||||||||
| telegraf_yum_gpgcheck: false | ||||||||||||
|
gsaudade99 marked this conversation as resolved.
|
||||||||||||
| telegraf_agent_tags: | ||||||||||||
| - tag_name: datacenter | ||||||||||||
| tag_value: rz | ||||||||||||
|
|
@@ -43,11 +44,11 @@ telegraf_plugins_default: | |||||||||||
| - name_suffix = "_alive" | ||||||||||||
|
|
||||||||||||
| java_packages: | ||||||||||||
| - java-21-openjdk | ||||||||||||
|
Comment on lines
46
to
+47
Contributor
There was a problem hiding this comment. Actually we should be able to remove |
||||||||||||
|
|
||||||||||||
| # CVMFS | ||||||||||||
| cvmfs_role: client | ||||||||||||
| cvmfs_yum_releasever: "9" | ||||||||||||
| galaxy_cvmfs_repos_enabled: true | ||||||||||||
| galaxy_cvmfs_server_urls: | ||||||||||||
| - domain: galaxyproject.org | ||||||||||||
|
|
@@ -68,11 +69,12 @@ dynmotd_custom: | |||||||||||
|
|
||||||||||||
| # Docker | ||||||||||||
| docker_packages: | ||||||||||||
|
gsaudade99 marked this conversation as resolved.
|
||||||||||||
| - docker-ce | ||||||||||||
| - docker-ce-cli | ||||||||||||
| - containerd.io | ||||||||||||
| - docker-buildx-plugin | ||||||||||||
| - docker-compose-plugin | ||||||||||||
| - docker-ce-rootless-extras | ||||||||||||
| docker_users: | ||||||||||||
| - centos | ||||||||||||
| - condor | ||||||||||||
|
|
@@ -105,6 +107,13 @@ autofs_service.enable: True | |||||||||||
| nfs_kernel_tuning: True | ||||||||||||
| nfs_kernel_tuning_parameters: | ||||||||||||
| sunrpc.tcp_max_slot_table_entries: 100 | ||||||||||||
| handy_groups: | ||||||||||||
| - group_name: galaxy | ||||||||||||
| group_gid: 999 | ||||||||||||
| handy_users: | ||||||||||||
| - user_name: galaxy | ||||||||||||
| user_uid: 999 | ||||||||||||
| user_group: galaxy | ||||||||||||
|
|
||||||||||||
| # usegalaxy_eu.handy.os_setup | ||||||||||||
| # ansible_root_cron | ||||||||||||
|
|
@@ -140,3 +149,8 @@ software_groups_to_install: | |||||||||||
| kernel_5_package: kernel-ml | ||||||||||||
|
|
||||||||||||
| docker_daemon_options: {} | ||||||||||||
|
|
||||||||||||
| # Devsec | ||||||||||||
| # Forsing group owenership to root. The role is for some reason trying to change it to "ssh_keys" | ||||||||||||
| # and this does not aligne with the base Rocky10 image | ||||||||||||
| ssh_host_keys_group: root | ||||||||||||
|
Comment on lines
+152
to
+156
Contributor
There was a problem hiding this comment.
Suggested change
I have removed the that code and tried this playbook. ---
- hosts: all
vars:
...
pre_tasks:
...
roles:
- role: usegalaxy_eu.handy.os_setup
vars:
enable_create_user: true
enable_powertools: true
enable_install_software: true
enable_grub: true
enable_kernel_5: "{{ true if (ansible_facts['distribution_major_version'] < '9') else false }}"
- geerlingguy.repo-epel # Install EPEL
- usegalaxy-eu.autoupdates # keep all of our packages up to date REMOVED until latest kernel is supported in dnbd3
- usegalaxy-eu.dynmotd
- influxdata.chrony
- usegalaxy-eu.telegraf
- devsec.hardening.ssh_hardening
post_tasks:
- name: Get owner and group for SSH host keys
ansible.builtin.stat:
path: "{{ item }}"
loop:
- /etc/ssh/ssh_host_rsa_key
- /etc/ssh/ssh_host_ecdsa_key
- /etc/ssh/ssh_host_ed25519_key
- /etc/ssh/ssh_host_rsa_key.pub
- /etc/ssh/ssh_host_ecdsa_key.pub
- /etc/ssh/ssh_host_ed25519_key.pub
register: ssh_host_keys_stat
- name: Debug SSH host key ownership
ansible.builtin.debug:
var: ssh_host_keys_statAnd I am getting gid 0 and uid 0 for the host keys.
Author
There was a problem hiding this comment. Now that I puzzle it, this might be SELinux. Have you tried with it already disabled?
Contributor
There was a problem hiding this comment. I was reviewing the rest of the PR and found this. Maybe that line had something to do with the discrepance before it was modified? |
||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| --- | ||
| ssh_permit_root_login: "no" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would like to keep the old, explicit structure, where you could also decide to not use generic, I remember there was a discussion about this with @domgz
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd also prefer to keep
generichere.Using
allwould also make it more difficult to implement ADR #3.