From abf9ec98051e6b5f7e03c86be6c388901317ea86 Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin <p.vetokhin@gmail.com>
Date: Sun, 10 Mar 2024 12:17:33 +0300
Subject: [PATCH] Merge group vars

---
 .../group_vars/{all/stacks.yaml => all.yaml}  | 19 +++++++++++++++++
 .../ansible/inventory/group_vars/all/all.yaml | 21 -------------------
 2 files changed, 19 insertions(+), 21 deletions(-)
 rename baker/ansible/inventory/group_vars/{all/stacks.yaml => all.yaml} (56%)
 delete mode 100644 baker/ansible/inventory/group_vars/all/all.yaml

diff --git a/baker/ansible/inventory/group_vars/all/stacks.yaml b/baker/ansible/inventory/group_vars/all.yaml
similarity index 56%
rename from baker/ansible/inventory/group_vars/all/stacks.yaml
rename to baker/ansible/inventory/group_vars/all.yaml
index f7d2556e..38d3f14a 100644
--- a/baker/ansible/inventory/group_vars/all/stacks.yaml
+++ b/baker/ansible/inventory/group_vars/all.yaml
@@ -1,10 +1,29 @@
 ---
+project:
+  name: bezmen
+  org: smecalculus
+  dir: "{{ playbook_dir }}/../.."
+
+repo_mode: n/a  # n/a, ro, rw
+
+binary_repo: maven.pkg.github.com
+image_repo: ghcr.io
+
+image_ns: "{{ image_repo }}/{{ project.org }}/{{ project.name }}"
+
+docker_entity: "{{ 'image' if repo_mode == 'n/a' else 'manifest' }}"
+
+ility: programmability  # programmability, resilience
+
+devenv: turing
 gear:
   image: stack/gear
 
+cicd: github
 pipeline:
   image: stack/pipeline
 
+opsenv: durkheim
 product:
   image: stack/product
   storages:
diff --git a/baker/ansible/inventory/group_vars/all/all.yaml b/baker/ansible/inventory/group_vars/all/all.yaml
deleted file mode 100644
index e3ffb2dd..00000000
--- a/baker/ansible/inventory/group_vars/all/all.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-project:
-  name: bezmen
-  org: smecalculus
-  dir: "{{ playbook_dir }}/../.."
-
-repo_mode: n/a  # values: rw, ro, n/a
-
-binary_repo: maven.pkg.github.com
-image_repo: ghcr.io
-
-image_ns: "{{ image_repo }}/{{ project.org }}/{{ project.name }}"
-
-docker_entity: "{{ 'image' if repo_mode == 'n/a' else 'manifest' }}"
-
-devenv: turing
-opsenv: durkheim
-
-ility: programmability
-
-cicd: github