Skip to content

Commit

Permalink
RFC-2547: Add support for execution environments
Browse files Browse the repository at this point in the history
Tested with ansible 2.15.x
  • Loading branch information
timeu committed Sep 12, 2023
1 parent 4794bf1 commit 0973b14
Show file tree
Hide file tree
Showing 82 changed files with 761 additions and 745 deletions.
7 changes: 7 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
warn_list: # or 'skip_list' to silence them completely
- experimental # all rules tagged as experimental
- yaml # Violations reported by yamllint
skip_list:
- var-naming[no-role-prefix]
- sanity[cannot-ignore]
14 changes: 14 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
========================
clip.hpc Release Notes
========================

.. contents:: Topics


v2.0.0
======

Release Summary
---------------

- Add support for newer ansible versions
22 changes: 12 additions & 10 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
### REQUIRED
# The namespace of the collection. This can be a company/brand/organization or product namespace under which all
# content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
Expand All @@ -8,18 +9,17 @@ namespace: clip
name: hpc

# The version of the collection. Must be compatible with semantic versioning
version: 1.10.0
version: 2.0.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md

# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
# @nicks:irc/im.site#channel'
authors:
- Uemit Seren <uemit.seren@gmi.oeaw.ac.at>
- Erich Birngrbuer <erich.birngruber@gmi.oeaw.ac.at>
- Petar Jager <petar.jager@imba.oeaw.ac.at>

- Uemit Seren <uemit.seren@gmi.oeaw.ac.at>
- Erich Birngrbuer <erich.birngruber@gmi.oeaw.ac.at>
- Petar Jager <petar.jager@imba.oeaw.ac.at>

### OPTIONAL but strongly recommended
# A short summary description of the collection
Expand All @@ -28,21 +28,23 @@ description: VBC CBE HPC deployment
# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
license:
- GPL-2.0-or-later
- GPL-2.0-or-later

# The path to the license file for the collection. This path is relative to the root of the collection. This key is
# mutually exclusive with 'license'
license_file: ''
license_file: ""

# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
# requirements as 'namespace' and 'name'
tags: []

tags: [linux, vbc, slurm, hpc, clip]
# Collections that this collection requires to be installed for it to be usable. The key of the dict is the
# collection label 'namespace.name'. The value is a version range
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
# range specifiers can be set and are separated by ','
dependencies: {}
dependencies:
community.mysql: ">=3.7.2"
community.general: ">=7.2.0"
ansible.posix: ">=1.5.4"

# The URL of the originating SCM repository
repository: http://example.com/repository
Expand Down
52 changes: 52 additions & 0 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
# Collections must specify a minimum required ansible version to upload
# to galaxy
requires_ansible: ">=2.9.10"

# Content that Ansible needs to load from another location or that has
# been deprecated/removed
# plugin_routing:
# action:
# redirected_plugin_name:
# redirect: ns.col.new_location
# deprecated_plugin_name:
# deprecation:
# removal_version: "4.0.0"
# warning_text: |
# See the porting guide on how to update your playbook to
# use ns.col.another_plugin instead.
# removed_plugin_name:
# tombstone:
# removal_version: "2.0.0"
# warning_text: |
# See the porting guide on how to update your playbook to
# use ns.col.another_plugin instead.
# become:
# cache:
# callback:
# cliconf:
# connection:
# doc_fragments:
# filter:
# httpapi:
# inventory:
# lookup:
# module_utils:
# modules:
# netconf:
# shell:
# strategy:
# terminal:
# test:
# vars:

# Python import statements that Ansible needs to load from another location
# import_redirection:
# ansible_collections.ns.col.plugins.module_utils.old_location:
# redirect: ansible_collections.ns.col.plugins.module_utils.new_location

# Groups of actions/modules that take a common set of options
# action_groups:
# group_name:
# - module1
# - module2
4 changes: 0 additions & 4 deletions roles/.ansible-lint

This file was deleted.

1 change: 0 additions & 1 deletion roles/beegfs_client/.ansible-lint

This file was deleted.

1 change: 0 additions & 1 deletion roles/beegfs_client/.yamllint

This file was deleted.

2 changes: 1 addition & 1 deletion roles/beegfs_client/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ role_beegfs_client_interfaces: []
role_beegfs_client_enabled_quota: false
role_beegfs_client_ofed_include_path:
role_beegfs_client_scope_config: true
role_beegfs_client_use_dkms: true
role_beegfs_client_use_dkms: true
10 changes: 5 additions & 5 deletions roles/beegfs_client/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# handlers file for role-beegfs-client

- name: Restart BeeGFS helperd
systemd:
name: "beegfs-helperd"
ansible.builtin.systemd:
name: beegfs-helperd
daemon-reload: true
state: restarted
listen: "Restart BeeGFS client service"
listen: Restart BeeGFS client service

- name: Restart BeeGFS client
systemd:
name: "beegfs-client"
ansible.builtin.systemd:
name: beegfs-client
daemon-reload: true
state: restarted
when: not role_beegfs_client_use_dkms | bool
Expand Down
11 changes: 5 additions & 6 deletions roles/beegfs_client/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ galaxy_info:

license: MIT

min_ansible_version: 2.7
min_ansible_version: "2.7"

# If this a Container Enabled role, provide the minimum Ansible Container version.
# min_ansible_container_version:
Expand All @@ -28,12 +28,11 @@ galaxy_info:
# platforms is a list of platforms, and each platform has a name and a list of versions.
#
platforms:
- name: Centos
- name: EL
versions:
- 7
- name: RHEL
versions:
- 7
- "7"
- "8"

# - name: SomePlatform
# versions:
# - all
Expand Down
2 changes: 1 addition & 1 deletion roles/beegfs_client/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hosts: all
tasks:
- name: Include beegfs_client role
include_role:
ansible.builtin.include_role:
name: beegfs_client
5 changes: 0 additions & 5 deletions roles/beegfs_client/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ dependency:
name: galaxy
driver:
name: docker
lint: |
set -e
yamllint .
ansible-lint
flake8
platforms:
- name: instance-centos7-${INSTANCE_ID:-local}
image: centos:7
Expand Down
4 changes: 2 additions & 2 deletions roles/beegfs_client/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
tasks:
- name: Setup artifactory
vars:
baseurl: "https://www.beegfs.io/release/beegfs_7.2.1/dists/rhel{{ ansible_distribution_major_version }}"
yum_repository:
baseurl: https://www.beegfs.io/release/beegfs_7.2.1/dists/rhel{{ ansible_distribution_major_version }}
ansible.builtin.yum_repository:
name: beegfs
description: Beegfs RPM repo
file: beegfs_repos
Expand Down
Loading

0 comments on commit 0973b14

Please sign in to comment.