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

Don't define Ansible dependency roles twice #7

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
1 change: 0 additions & 1 deletion .dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ansible
ansible-core>=2.13.9
ansible-lint
yamllint
molecule
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: install dependencies
run: >
pip install -r .dev_requirements.txt
- name: Install dependencies
run: pip install -r .dev_requirements.txt

- run: yamllint --strict -c .yamllint .

Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: install dependencies
- name: Install dependencies
run: pip install -r .dev_requirements.txt

- name: install Ansbile dependencies
run: ansible-galaxy install -r requirements.yml

- name: test playbook
- name: Test playbook
run: molecule test
env:
PY_COLORS: '1'
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ galaxy_info:
- jammy
- noble
dependencies:
- role: elan.opencast_repository
- name: elan.opencast_repository
version: v0.1.0
4 changes: 2 additions & 2 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
opencast_repository_enabled_release: true
opencast_opensearch_heap_size: 100m
tasks:
- name: Include opensearch role
- name: Apply opencast_opensearch role
ansible.builtin.include_role:
name: "opencast_opensearch"
name: elan.opencast_opensearch
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ driver:
name: containers
dependency:
name: galaxy
enabled: false
enabled: true
platforms:
# GH Action for EL8 fails
# - name: el8
Expand Down
3 changes: 3 additions & 0 deletions molecule/default/requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
- name: elan.opencast_repository
version: v0.1.0
5 changes: 0 additions & 5 deletions requirements.yml

This file was deleted.