ansible rework

ansible/roles/forgejo_runner/tasks/main.yaml

@@ -1,42 +1,29 @@
 ---
-- name: Create Forgejo Runner directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: '0755'
-  loop:
-    - /opt/forgejo-runner
-    - /opt/forgejo-runner/data
-    - /opt/forgejo-runner/config
+- name: Validate Forgejo Runner variables
+  ansible.builtin.import_tasks: validate.yaml
 
-- name: Deploy Forgejo Runner configuration
-  template:
-    src: config.yaml.j2
-    dest: /opt/forgejo-runner/config/config.yaml
-    mode: '0644'
-  notify: Restart Forgejo Runner
-
-- name: Deploy Forgejo Runner docker-compose
-  template:
-    src: docker-compose.yml.j2
-    dest: /opt/forgejo-runner/docker-compose.yml
-    mode: '0644'
-  notify: Restart Forgejo Runner
-
-- name: Start Forgejo Runner
-  community.docker.docker_compose_v2:
-    project_src: /opt/forgejo-runner
-    state: present
-  register: runner_output
+- name: Deploy Forgejo Runner using shared docker_service role
+  ansible.builtin.include_role:
+    name: docker_service
+  vars:
+    service_name: "forgejo-runner"
+    service_base_path: "{{ forgejo_runner_base_path }}"
+    service_directories:
+      - { path: "data", mode: "0755" }
+      - { path: "config", mode: "0755" }
+    service_templates:
+      - { src: "config.yaml.j2", dest: "config/config.yaml", mode: "0644" }
+      - { src: "docker-compose.yml.j2", dest: "docker-compose.yml", mode: "0644" }
+    health_check_enabled: false  # Runner doesn't expose HTTP port
 
 - name: Check if runner is already registered
   ansible.builtin.stat:
-    path: /opt/forgejo-runner/data/.runner
+    path: "{{ forgejo_runner_base_path }}/data/.runner"
   register: runner_registered
 
 - name: Set permissions on data directory
   ansible.builtin.file:
-    path: /opt/forgejo-runner/data
+    path: "{{ forgejo_runner_base_path }}/data"
     state: directory
     mode: '0777'
     recurse: true
@@ -44,7 +31,7 @@
 
 - name: Stop runner for registration
   community.docker.docker_compose_v2:
-    project_src: /opt/forgejo-runner
+    project_src: "{{ forgejo_runner_base_path }}"
     state: stopped
   when: not runner_registered.stat.exists
 
@@ -52,31 +39,32 @@
   ansible.builtin.command:
     cmd: >
       docker run --rm
-      -v /opt/forgejo-runner/data:/data
-      -v /opt/forgejo-runner/config/config.yaml:/config.yaml
+      -v {{ forgejo_runner_base_path }}/data:/data
+      -v {{ forgejo_runner_base_path }}/config/config.yaml:/config.yaml
       code.forgejo.org/forgejo/runner:{{ forgejo_runner_version }}
       forgejo-runner register
       --no-interactive
       --token {{ forgejo_runner_token }}
       --name runner-{{ inventory_hostname }}
-      --instance http://10.10.0.10:{{ forgejo_http_port }}
+      --instance http://{{ asxpio_ops_vpc_ip }}:{{ forgejo_http_port }}
       --labels ubuntu-latest:docker://node:20-bookworm,ubuntu-22.04:docker://node:20-bookworm,ubuntu-24.04:docker://node:22-bookworm,debian-latest:docker://debian:bookworm,debian-12:docker://debian:bookworm,debian-11:docker://debian:bullseye,arch-latest:docker://archlinux:latest,nginx-latest:docker://nginx:latest,nginx-alpine:docker://nginx:alpine,node-20:docker://node:20,node-22:docker://node:22,python-3.11:docker://python:3.11,python-3.12:docker://python:3.12,alpine-latest:docker://alpine:latest
   when: not runner_registered.stat.exists
+  changed_when: true
   register: registration_result
 
 - name: Start runner after registration
   community.docker.docker_compose_v2:
-    project_src: /opt/forgejo-runner
+    project_src: "{{ forgejo_runner_base_path }}"
     state: present
   when: not runner_registered.stat.exists
 
 - name: Display runner status
-  debug:
+  ansible.builtin.debug:
     msg: |
       Forgejo Runner deployed successfully!
 
       Runner name: runner-{{ inventory_hostname }}
-      Forgejo instance: http://10.10.0.10:{{ forgejo_http_port }}
+      Forgejo instance: http://{{ asxpio_ops_vpc_ip }}:{{ forgejo_http_port }}
       {% if runner_registered.stat.exists %}
       Status: Already registered (using existing registration)
       {% else %}

ansible/roles/forgejo_runner/tasks/validate.yaml

@@ -0,0 +1,26 @@
+---
+# Variable validation for forgejo_runner role
+
+- name: Validate Forgejo Runner required variables
+  ansible.builtin.assert:
+    that:
+      - forgejo_runner_base_path is defined
+      - forgejo_runner_base_path | length > 0
+      - forgejo_runner_token is defined
+      - forgejo_runner_token | length > 0
+      - forgejo_runner_version is defined
+      - forgejo_runner_version | length > 0
+      - forgejo_http_port is defined
+      - forgejo_http_port | int > 0
+      - asxpio_ops_vpc_ip is defined
+      - asxpio_ops_vpc_ip | length > 0
+    fail_msg: |
+      Forgejo Runner role requires:
+      - forgejo_runner_base_path (installation directory)
+      - forgejo_runner_token (runner registration token)
+      - forgejo_runner_version (e.g., '3.5.1')
+      - forgejo_http_port (Forgejo HTTP port)
+      - asxpio_ops_vpc_ip (Forgejo server IP)
+
+      WARNING: forgejo_runner_token should be stored in Ansible Vault!
+    success_msg: "Forgejo Runner variables validated (WARNING: token should use Ansible Vault)"