From 1832027f291d6b10d8697c49a161bee82a50c854 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Sat, 1 Nov 2025 13:09:08 +0100
Subject: [PATCH] feat: implement new role layout

---
 .gitlab-ci.yml         |  7 +------
 playbook.yaml          | 10 +++++-----
 roles/requirements.yml |  6 ------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54a4cb4..ccccaf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,19 +2,14 @@
 
 # gitLab ci stages
 stages:
-
-  # deployment
   - "gitleaks"
   - "linting"
-  - "deployment"
-
 
 # include jobs
 include:
 
-  # deployment
+  # code plumbing
   - local: ".gitlab/gitleaks.yaml"
-  - local: ".gitlab/deployment.yaml"
 
   # linting
   - component: "$CI_SERVER_FQDN/components/ansible/linting@v3.0.3"
diff --git a/playbook.yaml b/playbook.yaml
index 764c8f6..4eed7a6 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -4,7 +4,7 @@
 - name: "install Grafana and Prometheus"
   hosts: "all"
   become: true
-  pre_tasks:
+  tasks:
 
     # due to semaphore bug we need to do this ourselves
     - name: "force-update requirements"
@@ -15,7 +15,7 @@
       changed_when: false
       failed_when: false
 
-  roles:
-    - role: "docker"
-    - role: "grafana"
-    - role: "traefik"
+    # execute the role
+    - name: "execute role: grafana"
+      ansible.builtin.include_role:
+        name: "grafana"
diff --git a/roles/requirements.yml b/roles/requirements.yml
index 58c0315..d79ced4 100644
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -1,12 +1,6 @@
 ---
 
 roles:
-  - name: "docker"
-    src: "https://gitlab.simoncor.net/ansible/ans-docker.git"
-    scm: "git"
   - name: "grafana"
     src: "https://gitlab.simoncor.net/ansible/ans-grafana.git"
     scm: "git"
-  - name: "traefik"
-    src: "https://gitlab.simoncor.net/ansible/ans-traefik.git"
-    scm: "git"