From e8344bb29a42cc2c39d59abb574aa6a6044c2516 Mon Sep 17 00:00:00 2001 From: karpenok Date: Mon, 9 Nov 2026 22:49:49 +0700 Subject: [PATCH] fix(ansible): ensure Docker is installed in core_net and fix package name in core_secrets --- .gitea/workflows/ansible-core-secrets.yml | 1 + ansible/playbooks/core_secrets.yml | 1 + .../core_net/files/dynamic/infisical.yml | 1 + ansible/roles/core_net/tasks/main.yml | 22 +++++++++++++++++++ ansible/roles/core_secrets/defaults/main.yml | 1 + ansible/roles/core_secrets/tasks/main.yml | 2 +- .../core_secrets/templates/compose.yaml.j2 | 1 + 7 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ansible-core-secrets.yml b/.gitea/workflows/ansible-core-secrets.yml index f96a142..3a79a80 100644 --- a/.gitea/workflows/ansible-core-secrets.yml +++ b/.gitea/workflows/ansible-core-secrets.yml @@ -44,3 +44,4 @@ jobs: export ANSIBLE_HOST_KEY_CHECKING=False cd "${HOME}/homelab-infra/ansible" ansible-playbook -i inventories/prod/hosts.yml playbooks/core_secrets.yml + diff --git a/ansible/playbooks/core_secrets.yml b/ansible/playbooks/core_secrets.yml index b871668..205277e 100644 --- a/ansible/playbooks/core_secrets.yml +++ b/ansible/playbooks/core_secrets.yml @@ -4,3 +4,4 @@ become: true roles: - core_secrets + diff --git a/ansible/roles/core_net/files/dynamic/infisical.yml b/ansible/roles/core_net/files/dynamic/infisical.yml index 04b1e5f..a9d21be 100644 --- a/ansible/roles/core_net/files/dynamic/infisical.yml +++ b/ansible/roles/core_net/files/dynamic/infisical.yml @@ -16,3 +16,4 @@ http: loadBalancer: servers: - url: "http://192.168.1.102:8080" + diff --git a/ansible/roles/core_net/tasks/main.yml b/ansible/roles/core_net/tasks/main.yml index ac3cdc5..7da306b 100644 --- a/ansible/roles/core_net/tasks/main.yml +++ b/ansible/roles/core_net/tasks/main.yml @@ -1,4 +1,26 @@ --- +- name: Установить базовые пакеты Debian + ansible.builtin.apt: + name: + - python3 + - ca-certificates + - curl + state: present + update_cache: true + +- name: Установить Docker и Docker Compose + ansible.builtin.apt: + name: + - docker.io + - docker-compose + state: present + +- name: Включить и запустить службу Docker + ansible.builtin.systemd: + name: docker + enabled: true + state: started + - name: Создать каталоги Traefik ansible.builtin.file: path: "{{ item }}" diff --git a/ansible/roles/core_secrets/defaults/main.yml b/ansible/roles/core_secrets/defaults/main.yml index 0d52a06..707ef0e 100644 --- a/ansible/roles/core_secrets/defaults/main.yml +++ b/ansible/roles/core_secrets/defaults/main.yml @@ -14,3 +14,4 @@ infisical_postgres_password: "Vrl2cqlvXNGtf5h8WOT5eqPsgLmHJJCt" infisical_postgres_db: "infisical" infisical_encryption_key: "20e2553f18b49f077441eaf7699c1d18" infisical_auth_secret: "j+n6OqMIZpsnhS1QoHeHa4orTh6CBEDln7SzqDa826U=" + diff --git a/ansible/roles/core_secrets/tasks/main.yml b/ansible/roles/core_secrets/tasks/main.yml index 262c448..ed29353 100644 --- a/ansible/roles/core_secrets/tasks/main.yml +++ b/ansible/roles/core_secrets/tasks/main.yml @@ -13,7 +13,7 @@ ansible.builtin.apt: name: - docker.io - - docker-compose-v2 + - docker-compose state: present - name: Включить и запустить службу Docker diff --git a/ansible/roles/core_secrets/templates/compose.yaml.j2 b/ansible/roles/core_secrets/templates/compose.yaml.j2 index 58fe3c6..55fcfec 100644 --- a/ansible/roles/core_secrets/templates/compose.yaml.j2 +++ b/ansible/roles/core_secrets/templates/compose.yaml.j2 @@ -70,3 +70,4 @@ networks: secrets-net: name: secrets-net driver: bridge +