From a076cd97d691a28a63db3a8ce707de8483c09d83 Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Mon, 20 Jul 2026 13:49:32 +0200
Subject: [PATCH] chore: add dev/prod to ansible playbooks

---
 .gitea/workflows/add-new-service.yml                  |  9 ++++++---
 .gitea/workflows/deploy.yml                           |  6 +++---
 ansible/{ => inventories/dev}/hosts.yml               | 10 +++++++---
 ansible/inventories/prod/hosts.yml                    | 11 +++++++++++
 ansible/playbooks/add-new-service.yml                 |  3 +--
 .../deploy-and-restart-modified-services.yml          |  3 +--
 ansible/playbooks/ioc-install.yml                     |  3 +--
 ansible/playbooks/ioc-restart.yml                     |  3 +--
 ansible/playbooks/ioc-start.yml                       |  3 +--
 9 files changed, 32 insertions(+), 19 deletions(-)
 rename ansible/{ => inventories/dev}/hosts.yml (64%)
 create mode 100644 ansible/inventories/prod/hosts.yml

diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml
index 1fa4587..767b799 100644
--- a/.gitea/workflows/add-new-service.yml
+++ b/.gitea/workflows/add-new-service.yml
@@ -55,10 +55,13 @@ jobs:
         run: |
           uv run ansible-galaxy collection install -r ansible/collections/requirements.yml -p ./ansible/installed-collections
 
+      # TODO: dev/prod
       - name: Run New Service Playbook
         working-directory: ansible
         run: |
           uv run ansible-playbook playbooks/add-new-service.yml \
-            -i hosts.yml \
-            --extra-vars="repo_root=${{ github.workspace }} agebd_env=dev service_name_lower=${{ steps.parse_branch.outputs.service_name_lower }}" \
-            -v
\ No newline at end of file
+            -i "inventories/dev/hosts.yml" \
+            --extra-vars="repo_root=${{ github.workspace }}" \
+            --extra-vars="agebd_env=dev" \
+            --extra-vars="service_name_lower=${{ steps.parse_branch.outputs.service_name_lower }}" \
+            -v
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 0df6517..55c86f7 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -98,6 +98,6 @@ jobs:
 
           # 3. Fire the playbook passing variables down
           ansible-playbook playbooks/deploy-and-restart-modified-services.yml \
-            -i hosts.yml \
-            -e "changed_services_raw='$CHANGED_SVC'" \
-            -e "agebd_env=$AGEBD_ENV"
+            -i "inventories/$AGEBD_ENV/hosts.yml" \
+            --extra-vars="changed_services_raw='$CHANGED_SVC'" \
+            --extra-vars="agebd_env=$AGEBD_ENV"
diff --git a/ansible/hosts.yml b/ansible/inventories/dev/hosts.yml
similarity index 64%
rename from ansible/hosts.yml
rename to ansible/inventories/dev/hosts.yml
index b5c4aa8..c95b9b6 100644
--- a/ansible/hosts.yml
+++ b/ansible/inventories/dev/hosts.yml
@@ -1,7 +1,11 @@
-all:
+lc:
   hosts:
     sls-lc:
       ansible_remote_tmp: /tmp/.ansible_${ansible_user}_tmp
-    sls-vserv-bd-hla01-dev:
+vserv:
+  hosts:
     sls-vserv-bd-01-dev:
-      ansible_ssh_pipelining: true
\ No newline at end of file
+      ansible_ssh_pipelining: true
+vserv-hla:
+  hosts:
+    sls-vserv-bd-hla01-dev:
diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml
new file mode 100644
index 0000000..3721522
--- /dev/null
+++ b/ansible/inventories/prod/hosts.yml
@@ -0,0 +1,11 @@
+lc:
+  hosts:
+    sls-lca:
+      ansible_remote_tmp: /tmp/.ansible_${ansible_user}_tmp
+vserv:
+  hosts:
+    sls-vserv-bd-01:
+      ansible_ssh_pipelining: true
+vserv-hla:
+  hosts:
+    sls-vserv-bd-hla01:
diff --git a/ansible/playbooks/add-new-service.yml b/ansible/playbooks/add-new-service.yml
index 912ddfb..aab6ed8 100644
--- a/ansible/playbooks/add-new-service.yml
+++ b/ansible/playbooks/add-new-service.yml
@@ -1,7 +1,6 @@
 ---
 - name: Add a new service
-  # TODO: dev/prod
-  hosts: sls-vserv-bd-hla01-dev
+  hosts: vserv-hla
   connection: local
   gather_facts: true  # Gather once here, available to all included tasks!
 
diff --git a/ansible/playbooks/deploy-and-restart-modified-services.yml b/ansible/playbooks/deploy-and-restart-modified-services.yml
index 0db13e4..cb47314 100644
--- a/ansible/playbooks/deploy-and-restart-modified-services.yml
+++ b/ansible/playbooks/deploy-and-restart-modified-services.yml
@@ -1,7 +1,6 @@
 ---
 - name: Deploy and Restart Modified Services
-  # TODO: dev/prod
-  hosts: sls-vserv-bd-hla01-dev
+  hosts: vserv-hla
   connection: local
 
   vars:
diff --git a/ansible/playbooks/ioc-install.yml b/ansible/playbooks/ioc-install.yml
index 615e1a0..f337812 100644
--- a/ansible/playbooks/ioc-install.yml
+++ b/ansible/playbooks/ioc-install.yml
@@ -1,7 +1,6 @@
 ---
 - name: Install an IOC
-  # TODO: dev/prod
-  hosts: sls-lc
+  hosts: lc
   gather_facts: false
 
   vars:
diff --git a/ansible/playbooks/ioc-restart.yml b/ansible/playbooks/ioc-restart.yml
index b0557af..a36728e 100644
--- a/ansible/playbooks/ioc-restart.yml
+++ b/ansible/playbooks/ioc-restart.yml
@@ -1,7 +1,6 @@
 ---
 - name: Restart an IOC
-  # TODO: dev/prod
-  hosts: sls-lc
+  hosts: lc
   gather_facts: false
 
   vars:
diff --git a/ansible/playbooks/ioc-start.yml b/ansible/playbooks/ioc-start.yml
index e332890..0824a5d 100644
--- a/ansible/playbooks/ioc-start.yml
+++ b/ansible/playbooks/ioc-start.yml
@@ -1,7 +1,6 @@
 ---
 - name: Start an IOC
-  # TODO: dev/prod
-  hosts: sls-vserv-bd-01-dev
+  hosts: vserv
   gather_facts: false
 
   tasks: