From f57b4e4ec7e2e9782f7abb18b0295c5d387de6eb Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Tue, 7 Jul 2026 17:14:20 +0200
Subject: [PATCH] chore: ansible ioc/service master restart

---
 ansible/playbooks/add-new-service.yml          |  6 ++++--
 ansible/plays/ioc/ioc-install.yml              |  7 ++++++-
 ansible/plays/ioc/ioc-restart.yml              | 18 +++++++++++++++++-
 .../service/service-deploy-and-restart.yml     |  5 +++++
 docs/ansible.md                                |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ansible/playbooks/add-new-service.yml b/ansible/playbooks/add-new-service.yml
index 90873e1..911c215 100644
--- a/ansible/playbooks/add-new-service.yml
+++ b/ansible/playbooks/add-new-service.yml
@@ -3,12 +3,14 @@
 
 - name: Install Master IOC
   vars:
-    service_dir_name: 000-master
+    ioc_service_name: 000-master
+    branch_name: "feature/add-service-{{ service_dir_name }}"
   import_playbook: ../plays/ioc/ioc-install.yml
 
 - name: Restart Master IOC
   vars:
-    service_dir_name: 000-master
+    ioc_service_name: 000-master
+    branch_name: "feature/add-service-{{ service_dir_name }}"
   import_playbook: ../plays/ioc/ioc-restart.yml
 
 - name: Deploy and Restart Master Service
diff --git a/ansible/plays/ioc/ioc-install.yml b/ansible/plays/ioc/ioc-install.yml
index f63698c..d0c0017 100644
--- a/ansible/plays/ioc/ioc-install.yml
+++ b/ansible/plays/ioc/ioc-install.yml
@@ -13,9 +13,14 @@
         dest: "{{ workspace_dir }}"
         version: main
         accept_hostkey: true
-        version: "feature/add-service-{{ service_dir_name }}"
+        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
+        service_dir_name: "{{ ioc_service_name | default(new_service_dir_name) }}"
+
     - name: "[{{ service_dir_name }}] Establish environment naming conventions"
       ansible.builtin.set_fact:
         # Extract MASTER from 000-master
diff --git a/ansible/plays/ioc/ioc-restart.yml b/ansible/plays/ioc/ioc-restart.yml
index fce9a1d..cac7aba 100644
--- a/ansible/plays/ioc/ioc-restart.yml
+++ b/ansible/plays/ioc/ioc-restart.yml
@@ -13,9 +13,25 @@
         dest: "{{ workspace_dir }}"
         version: main
         accept_hostkey: true
-        version: "feature/add-service-{{ service_dir_name }}"
+        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
+        service_dir_name: "{{ ioc_service_name | default(new_service_dir_name) }}"
+
+    - name: "[{{ service_dir_name }}] Establish environment naming conventions"
+      ansible.builtin.set_fact:
+        # Example: extract MASTER from 000-master
+        service_name_upper: "{{ service_dir_name[4:] | upper }}"
+        # Set suffix to "-DEV" if dev, otherwise empty ""
+        env_suffix_upper: "{{ '-DEV' if agebd_env == 'dev' else '' }}"
+
+    - name: "[{{ service_dir_name }}] Define file paths"
+      ansible.builtin.set_fact:
+        ioc_base_dir: "{{ workspace_dir }}/services/{{ service_dir_name }}/current/ioc"
+
     - name: "[{{ service_dir_name }}] Restart IOC"
       ansible.builtin.shell:
         cmd: "ioc restart AGEBD-CPCL-{{ service_name_upper }}{{ env_suffix_upper }}"
diff --git a/ansible/plays/service/service-deploy-and-restart.yml b/ansible/plays/service/service-deploy-and-restart.yml
index 286e4ac..1debed6 100644
--- a/ansible/plays/service/service-deploy-and-restart.yml
+++ b/ansible/plays/service/service-deploy-and-restart.yml
@@ -5,6 +5,11 @@
   gather_facts: false
 
   tasks:
+    - 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
+        service_dir_name: "{{ ioc_service_name | default(new_service_dir_name) }}"
+
     - name: "[{{ service_dir_name }}] Define service specific paths and names"
       ansible.builtin.set_fact:
         # 1. The literal directory name on disk (e.g., "000-master")
diff --git a/docs/ansible.md b/docs/ansible.md
index e9bae72..7a1e4e8 100644
--- a/docs/ansible.md
+++ b/docs/ansible.md
@@ -8,6 +8,6 @@ Set vars on command line:
 cd ansible
 ansible-playbook ansible/playbooks/add-new-service.yml \
             -i ansible/hosts.yml \
-            --extra-vars="agebd_env=dev service_dir_name=<service dir name>" \
+            --extra-vars="agebd_env=dev new_service_dir_name=<service dir name>" \
             -v
 ```
\ No newline at end of file