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

New chaperones #733

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
---

# Python CircleCI 2.0 configuration file
#
# Check https://circleci.com/docs/2.0/language-python/ for more details
# Python CircleCI 2.0 configuration file
# Check https://circleci.com/docs/2.0/language-python/ for more details.
#

version: 2.1
jobs:
build:
Expand Down
43 changes: 43 additions & 0 deletions group_vars/betabarrel_cluster/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,49 @@ regular_users:
- user: 'umcg-vipt-dm'
groups: ['umcg-vipt', "{{ functional_users_group }}"]
sudoers: '%umcg-vipt'
remote_users_in_local_groups:
- user: 'benjaminsm'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'bijlsmam'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'cimermans'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'langek'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'kanningaroj'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'neerincxp'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'vriesgb'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
#
# Shared storage related variables
#
Expand Down
43 changes: 43 additions & 0 deletions group_vars/copperfist_cluster/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,49 @@ regular_users:
- user: 'umcg-vipt-dm'
groups: ['umcg-vipt', "{{ functional_users_group }}"]
sudoers: '%umcg-vipt'
remote_users_in_local_groups:
- user: 'benjaminsm'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'bijlsmam'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'cimermans'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'langek'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'kanningaroj'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'neerincxp'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'vriesgb'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
#
# Shared storage related variables
#
Expand Down
2 changes: 1 addition & 1 deletion group_vars/deploy_admin_interface.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
volumes:
- mount_point: '/apps'
- mount_point: "{{ hpc_env_prefix }}"
device: '/dev/vdb'
mounted_owner: root
mounted_group: "{{ envsync_group }}"
Expand Down
43 changes: 43 additions & 0 deletions group_vars/wingedhelix_cluster/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,49 @@ regular_users:
- user: 'umcg-vipt-dm'
groups: ['umcg-vipt', "{{ functional_users_group }}"]
sudoers: '%umcg-vipt'
remote_users_in_local_groups:
- user: 'benjaminsm'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'bijlsmam'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'cimermans'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'langek'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'kanningaroj'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'neerincxp'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
- user: 'vriesgb'
groups: [
"{{ envsync_group }}", 'umcg-atd', 'umcg-gsad', 'umcg-gst',
'umcg-gap', 'umcg-gd', 'umcg-genomescan',
'umcg-labgnkbh', 'umcg-patho', 'umcg-vipt',
]
#
# Shared storage related variables
#
Expand Down
12 changes: 10 additions & 2 deletions lor-init
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
# $> lor-config tl
#

set -u

#
##
### Environment and bash sanity.
Expand All @@ -31,6 +29,13 @@ export LOR_DIR="$( cd -P "$( dirname "${BASH_SOURCE:-}" )" && pwd )"
#

function lor-config() {
local _opt_nounset_was_enbled
if [[ -o nounset ]]; then
_opt_nounset_was_enbled='true'
else
_opt_nounset_was_enbled='false'
set -u
fi
#
# Get and check input.
#
Expand Down Expand Up @@ -98,4 +103,7 @@ function lor-config() {
printf 'WARNING: Could not find Mitogen strategy plugin in %s\n' "${_ansible_mitogen_search_path}"
printf 'INFO: Mitogen strategy plugin is: %s.\n' 'disabled (default)'
fi
if [[ "${_opt_nounset_was_enbled}" == 'false' ]]; then
set +u
fi
}
10 changes: 10 additions & 0 deletions roles/build_environment/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,14 @@ build_env_dai_deps:
- 'python-pep8'
- 'python3'
- 'python3-pip'
build_env_chaperone_deps:
- 'bzip2'
- 'gcc'
- 'git'
- 'nano'
- 'openssl'
- 'rsync'
- 'tcl-devel'
- 'unzip'
- 'wget'
...
10 changes: 10 additions & 0 deletions roles/build_environment/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# The DAI requires additional packages for compiling Slurm, Lmod, Lua, Ansible, etc.,
# which users won't need.
#
# On chaperones we need a minimal build invironment too in order to deploy software
# with the playbooks from the ansible-pipeline repo.
#
---
- name: Install generic build environment packages on UIs and DAIs.
ansible.builtin.import_tasks: build_dependencies.yml
Expand All @@ -19,4 +22,11 @@
mandatory_deps: "{{ build_env_dai_deps }}"
optional_deps: []
when: inventory_hostname in groups['deploy_admin_interface']

- name: Install minimal build environment packages on chaperones.
ansible.builtin.import_tasks: build_dependencies.yml
vars:
mandatory_deps: "{{ build_env_chaperone_deps }}"
optional_deps: []
when: inventory_hostname in groups['chaperone']
...
13 changes: 13 additions & 0 deletions roles/envsync/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@
create_home: false
become: false

- name: "Create {{ hpc_env_prefix }} folder on root partition unless the machine already has a dedicated mount for {{ hpc_env_prefix }}."
ansible.builtin.file:
path: "{{ hpc_env_prefix }}"
state: directory
owner: root
group: "{{ envsync_group }}"
mode: '2775'
when: volumes | default([])
| selectattr('mount_point', 'defined')
| selectattr('mount_point', 'equalto', hpc_env_prefix)
| length <= 0
become: true

#
# Configure environment synchronization account.
#
Expand Down
8 changes: 8 additions & 0 deletions roles/regular_users/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,12 @@
inventory_hostname in groups['chaperone'] | default([]) or
inventory_hostname in groups['data_transfer'] | default([])
- ldap_domains['stack']['replication_provider_uri'] is not defined

- name: 'Add remote regular users to local groups.'
ansible.builtin.include_tasks:
file: remote_users_in_local_groups.yml
when:
- inventory_hostname in groups['chaperone'] | default([])
- remote_users_in_local_groups is defined

...
9 changes: 9 additions & 0 deletions roles/regular_users/tasks/remote_users_in_local_groups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
- name: 'Add regular users from an LDAP/AD to local groups.'
ansible.builtin.user:
name: "{{ item.user }}"
groups: "{{ item.groups }}"
append: true
with_items: "{{ remote_users_in_local_groups }}"
become: true
...
2 changes: 1 addition & 1 deletion single_group_playbooks/chaperone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
- name: '###==-> Roles for chaperones. <-==###'
hosts:
- chaperone
connection: local
roles:
- regular_users
- shared_storage
- sudoers
- build_environment
- envsync
...
4 changes: 0 additions & 4 deletions single_role_playbooks/envsync.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
---
- hosts:
- deploy_admin_interface
roles:
- envsync
- hosts:
- chaperone
connection: local
roles:
- envsync
...
4 changes: 0 additions & 4 deletions single_role_playbooks/regular_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
hosts:
- jumphost
- cluster
roles:
- regular_users
- hosts:
- chaperone
connection: local
roles:
- regular_users
...
4 changes: 0 additions & 4 deletions single_role_playbooks/shared_storage.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
---
- hosts:
- cluster
roles:
- shared_storage
- hosts:
- chaperone
connection: local
roles:
- shared_storage
...
4 changes: 0 additions & 4 deletions single_role_playbooks/sudoers.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
---
- hosts:
- user_interface
roles:
- sudoers
- hosts:
- chaperone
connection: local
roles:
- sudoers
...