From 81024523786dd3bba0ad835a99d330d42b989611 Mon Sep 17 00:00:00 2001
From: Waldemar Smirnow <wsmirnow@uni-osnabrueck.de>
Date: Fri, 31 Jan 2025 14:02:53 +0100
Subject: [PATCH] Don't define Ansible dependency roles twice

Since the Ansible dependency roles are defined in meta/main.yml, we don't need to define them twice in requirements.yml. But molecule don't read dependencies from meta/main.yml, so we need to put requirements.yml for the molecule.
---
 .dev_requirements.txt             | 1 -
 .github/workflows/lint.yml        | 5 ++---
 .github/workflows/molecule.yml    | 7 ++-----
 meta/main.yml                     | 2 +-
 molecule/default/converge.yml     | 6 ++----
 molecule/default/molecule.yml     | 2 +-
 molecule/default/requirements.yml | 3 +++
 requirements.yml                  | 5 -----
 8 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 molecule/default/requirements.yml
 delete mode 100644 requirements.yml

diff --git a/.dev_requirements.txt b/.dev_requirements.txt
index 0a881ae..842c803 100644
--- a/.dev_requirements.txt
+++ b/.dev_requirements.txt
@@ -1,5 +1,4 @@
 ansible
-ansible-core>=2.13.9
 ansible-lint
 yamllint
 molecule
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8a80fa3..4e64e93 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -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 .
 
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 25127d9..06aa3a1 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -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'
diff --git a/meta/main.yml b/meta/main.yml
index efcce25..82b3b0c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,5 +23,5 @@ galaxy_info:
         - jammy
         - noble
 dependencies:
-  - role: elan.opencast_repository
+  - name: elan.opencast_repository
     version: v0.1.0
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index a7b7eef..8fdf215 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -5,7 +5,5 @@
     opencast_version_major: 17
     opencast_repository_enabled_release: true
     opencast_opensearch_heap_size: 100m
-  tasks:
-    - name: Include opensearch role
-      ansible.builtin.include_role:
-        name: "opencast_opensearch"
+  roles:
+    - elan.opencast_opensearch
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 60cd396..a0661f5 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: containers
 dependency:
   name: galaxy
-  enabled: false
+  enabled: true
 platforms:
   # GH Action for EL8 fails
   # - name: el8
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
new file mode 100644
index 0000000..9bc9de1
--- /dev/null
+++ b/molecule/default/requirements.yml
@@ -0,0 +1,3 @@
+---
+- name: elan.opencast_repository
+  version: v0.1.0
diff --git a/requirements.yml b/requirements.yml
deleted file mode 100644
index 9a10588..0000000
--- a/requirements.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-roles:
-  - name: elan.opencast_repository
-    version: v0.1.0