From d9d11a6fe8141a256b63bb2751d6d855cbe9845e Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Tue, 7 Jul 2026 18:01:10 +0200
Subject: [PATCH] fix: cicd ansible

---
 .gitea/workflows/add-new-service.yml          |  4 ++--
 ansible/playbooks/add-new-service.yml         | 20 +++++++++----------
 .../service/service-deploy-and-restart.yml    | 19 +-----------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml
index 3c3af1a..d9081b5 100644
--- a/.gitea/workflows/add-new-service.yml
+++ b/.gitea/workflows/add-new-service.yml
@@ -20,11 +20,11 @@ jobs:
         run: |
           BRANCH="${{ github.ref_name }}"
           SERVICE_NAME="${BRANCH#feature/add-service-}"
-          echo "service_name=$SERVICE_NAME" >> $GITHUB_OUTPUT
+          echo "new_service_dir_name=$SERVICE_NAME" >> $GITHUB_OUTPUT
 
       - name: Run New Service Playbook
         run: |
           ansible-playbook ansible/playbooks/add-new-service.yml \
             -i ansible/hosts.yml \
-            --extra-vars="repo_root=${{ github.workspace }} agebd_env=dev service_dir_name=${{ steps.parse_branch.outputs.service_name }}" \
+            --extra-vars="repo_root=${{ github.workspace }} agebd_env=dev new_service_dir_name=${{ steps.parse_branch.outputs.new_service_dir_name }}" \
             -v
\ No newline at end of file
diff --git a/ansible/playbooks/add-new-service.yml b/ansible/playbooks/add-new-service.yml
index 9fa7f41..ffa6a06 100644
--- a/ansible/playbooks/add-new-service.yml
+++ b/ansible/playbooks/add-new-service.yml
@@ -1,17 +1,17 @@
 # TODO: Create venv and install ansible? That way not dependent on ansible
 # being installed on machine.
 
-- name: Install Master IOC
-  vars:
-    ioc_service_name: 000-master
-    branch_name: "feature/add-service-{{ new_service_dir_name }}"
-  import_playbook: ../plays/ioc/ioc-install.yml
+# - name: Install Master IOC
+#   vars:
+#     ioc_service_name: 000-master
+#     branch_name: "feature/add-service-{{ new_service_dir_name }}"
+#   import_playbook: ../plays/ioc/ioc-install.yml
 
-- name: Restart Master IOC
-  vars:
-    ioc_service_name: 000-master
-    branch_name: "feature/add-service-{{ new_service_dir_name }}"
-  import_playbook: ../plays/ioc/ioc-restart.yml
+# - name: Restart Master IOC
+#   vars:
+#     ioc_service_name: 000-master
+#     branch_name: "feature/add-service-{{ new_service_dir_name }}"
+#   import_playbook: ../plays/ioc/ioc-restart.yml
 
 - name: Deploy and Restart Master Service
   vars:
diff --git a/ansible/plays/service/service-deploy-and-restart.yml b/ansible/plays/service/service-deploy-and-restart.yml
index 514adda..8c0c06e 100644
--- a/ansible/plays/service/service-deploy-and-restart.yml
+++ b/ansible/plays/service/service-deploy-and-restart.yml
@@ -1,27 +1,10 @@
 - name: Deploy and Restart Service
   # TODO: dev/prod
   hosts: sls-vserv-bd-hla01-dev
-  # connection: local
+  connection: local
   gather_facts: false
   
-  vars:
-    workspace_dir: "/tmp/hla_framework_bd"
-
   tasks:
-    # Tell Git to bypass the strict ownership check for this specific directory
-    - name: Whitelist temporary git directory
-      ansible.builtin.command:
-        cmd: "git config --global --add safe.directory {{ workspace_dir }}"
-
-    # TODO: can remove when running on runner
-    - name: Clone this repository
-      ansible.builtin.git:
-        repo: "git@gitea.psi.ch:sls/hla_framework_bd.git"
-        dest: "{{ workspace_dir }}"
-        accept_hostkey: true
-        version: "{{ branch_name }}"
-        force: true
-
     - name: Initialize isolated service directory name
       ansible.builtin.set_fact:
         # Uses ioc_service_name if defined in vars, otherwise falls back to the CLI extra-vars