Skip to content

Commit

Permalink
Merge pull request #675 from pneerincx/fix/openssl
Browse files Browse the repository at this point in the history
Fix for compilation issues.
  • Loading branch information
marieke-bijlsma authored Nov 15, 2022
2 parents 5e826c9 + 75b7dd0 commit 36a0e0a
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 79 deletions.
62 changes: 62 additions & 0 deletions roles/build_environment/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
---
build_env_generic_deps:
- '@development'
- 'glibc-common'
- 'glibc-devel'
- 'glibc-headers'
- 'gnutls-devel'
- 'intltool'
- 'kernel-devel'
- 'libselinux-devel'
- 'libsodium-devel'
- 'openssl-devel'
- 'patch'
- 'qt5-qtbase-devel'
- 'qt5-qtxmlpatterns-devel'
- 'rpm-build'
build_env_optional_deps:
- 'openssl11'
build_env_dai_deps:
#
# Slurm dependencies.
#
- 'readline-devel'
- 'pkgconfig'
- 'perl-ExtUtils-MakeMaker'
- 'perl'
- 'pam-devel'
- 'numactl-devel'
- 'nss-softokn-freebl'
- 'ncurses-devel'
- 'mysql-devel'
- 'munge-libs'
- 'munge-devel'
- 'mariadb-devel'
- 'man2html'
- 'lua-devel'
- 'hwloc-devel'
- 'hdf5-devel'
#
# Ansible dependencies.
#
- 'python-devel' # Previously python2-devel
- 'python-nose'
- 'python-coverage'
- 'python-mock'
- 'python-boto3'
- 'python-botocore'
- 'python-ldap'
- 'python-passlib'
- 'python2-sphinx-theme-alabaster'
- 'pytest'
#
# Lua, Lmod, EasyBuild dependencies.
#
- 'rdma-core-devel' # first was 'rmda-core-devel', then some period 'mlnx-ofa_kernel-devel', now is rdma again
- 'libxml2-devel'
- 'libXext-devel'
- 'libX11-devel'
- 'python-pep8'
- 'python3'
- 'python3-pip'
...
24 changes: 24 additions & 0 deletions roles/build_environment/tasks/build_dependencies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
- name: Install mandatory build depedencies.
ansible.builtin.yum:
state: latest
update_cache: true
name: "{{ mandatory_deps | default([]) }}"
become: true

- name: Gather list of installed package.
ansible.builtin.package_facts:
manager: auto
become: true

- name: Install corresponding development package if a specific, optional package was installed.
ansible.builtin.yum:
state: latest
update_cache: true
name:
- "{{ item }}-devel"
when:
- "item in ansible_facts.packages"
with_items: "{{ optional_deps | default([]) }}"
become: true
...
51 changes: 0 additions & 51 deletions roles/build_environment/tasks/dai_build_dependencies.yml

This file was deleted.

22 changes: 0 additions & 22 deletions roles/build_environment/tasks/generic_build_dependencies.yml

This file was deleted.

12 changes: 9 additions & 3 deletions roles/build_environment/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
#
---
- name: Install generic build environment packages on UIs and DAIs.
ansible.builtin.import_tasks: generic_build_dependencies.yml
ansible.builtin.import_tasks: build_dependencies.yml
vars:
mandatory_deps: "{{ build_env_generic_deps }}"
optional_deps: "{{ build_env_optional_deps }}"
when: inventory_hostname in groups['user_interface'] or inventory_hostname in groups['deploy_admin_interface']

- name: Install extra build environment packages on DAIs.
ansible.builtin.import_tasks: dai_build_dependencies.yml
- name: Install extended build environment packages on DAIs.
ansible.builtin.import_tasks: build_dependencies.yml
vars:
mandatory_deps: "{{ build_env_dai_deps }}"
optional_deps: []
when: inventory_hostname in groups['deploy_admin_interface']
...
5 changes: 3 additions & 2 deletions roles/cluster/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
cluster_common_packages:
- apptainer
- apptainer-suid
- bash-completion
- bc
- bcc-tools
Expand All @@ -20,13 +22,12 @@ cluster_common_packages:
- ncurses-static
- net-tools
- openssl
- openssl11 # Required for openldap-ltb RPMs.
- qt5-qtbase
- qt5-qtxmlpatterns
- readline-static
- rsync
- screen
- apptainer
- apptainer-suid
- strace
- tcl-devel
- telnet
Expand Down
2 changes: 1 addition & 1 deletion single_group_playbooks/pre_deploy_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
ansible.builtin.include_vars:
file: "{{ item }}"
name: "{{ item | dirname | basename }}"
with_items: "{{ ip_addresses_files.files | map (attribute='path') | list }}"
with_items: "{{ ip_addresses_files.files | map(attribute='path') | list }}"
delegate_to: localhost
connection: local
...

0 comments on commit 36a0e0a

Please sign in to comment.