Удалена папка dockerfiles/debian и обновлены все конфигурации
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Ansible Testing / test (default) (push) Has been cancelled
Ansible Testing / test (minimal) (push) Has been cancelled
Ansible Testing / test (performance) (push) Has been cancelled
Ansible Testing / deploy-check (push) Has been cancelled

- Удалена папка dockerfiles/debian
- Обновлены все presets/*.yml файлы с новыми образами
- Обновлена документация в соответствии с новыми возможностями
- Добавлены новые версии Ubuntu (20.04, 22.04, 24.04)
- Добавлены новые версии CentOS (7, 8, 9)
- Добавлены новые версии Debian (9, 10, 11, 12)
- Обновлены family в hosts секциях
- Обновлена документация по поддержке платформ
This commit is contained in:
Сергей Антропов
2025-10-26 00:08:56 +03:00
parent a435778683
commit 692fe8c6c0
15 changed files with 179 additions and 147 deletions

View File

@@ -37,7 +37,7 @@ systemd_defaults:
hosts:
# Debian-based системы
- name: ubuntu20-test
family: ubuntu20
family: ubuntu2220
groups: [test, debian, ubuntu]
publish:
- "8080:80"
@@ -46,7 +46,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: ubuntu22-test
family: ubuntu22
family: ubuntu2222
groups: [test, debian, ubuntu]
publish:
- "8081:80"
@@ -55,7 +55,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: ubuntu24-test
family: ubuntu24
family: ubuntu2224
groups: [test, debian, ubuntu]
publish:
- "8082:80"
@@ -64,7 +64,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: debian9-test
family: debian9
family: debian129
groups: [test, debian]
publish:
- "8083:80"
@@ -73,7 +73,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: debian10-test
family: debian10
family: debian1210
groups: [test, debian]
publish:
- "8084:80"
@@ -82,7 +82,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: debian11-test
family: debian11
family: debian1211
groups: [test, debian]
publish:
- "8085:80"
@@ -91,7 +91,7 @@ hosts:
TEST_FAMILY: "Debian"
- name: debian12-test
family: debian12
family: debian1212
groups: [test, debian]
publish:
- "8086:80"
@@ -120,7 +120,7 @@ hosts:
# RHEL-based системы
- name: centos7-test
family: centos7
family: centos97
groups: [test, rhel, centos]
publish:
- "8090:80"
@@ -129,7 +129,7 @@ hosts:
TEST_FAMILY: "RedHat"
- name: centos8-test
family: centos8
family: centos98
groups: [test, rhel, centos]
publish:
- "8091:80"
@@ -138,7 +138,7 @@ hosts:
TEST_FAMILY: "RedHat"
- name: centos9-test
family: centos9
family: centos99
groups: [test, rhel, centos]
publish:
- "8092:80"

View File

@@ -36,8 +36,8 @@ systemd_defaults:
hosts:
# Стандартный набор - 2 хоста для базового тестирования (стабильные ОС)
- name: u1
family: ubuntu22
family: ubuntu2222
groups: [test, web]
- name: u2
family: debian12
family: debian1212
groups: [test, web]

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -29,10 +36,10 @@ systemd_defaults:
hosts:
# Базовые хосты (стабильные ОС)
- name: u1
family: ubuntu22
family: ubuntu2222
groups: [test, web]
- name: u2
family: debian12
family: debian1212
groups: [test, web]
# DinD узел (Docker-in-Docker)
@@ -44,7 +51,7 @@ hosts:
# DOoD узел (Docker-out-of-Docker)
- name: dood1
type: dood
family: ubuntu22
family: ubuntu2222
groups: [dood]
publish: ["8081:8081"]
env:

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -29,7 +36,7 @@ systemd_defaults:
hosts:
# Тестовые хосты
- name: test1
family: debian12
family: debian1212
groups: [test]
- name: test2
family: rhel
@@ -44,7 +51,7 @@ hosts:
# DOoD узел (Docker-out-of-Docker)
- name: dood1
type: dood
family: debian12
family: debian1212
groups: [dood]
publish: ["8081:8081"]
env:

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -30,19 +37,19 @@ systemd_defaults:
hosts:
# ETCD кластер (5 узлов для высокой доступности)
- name: etcd1
family: debian12
family: debian1212
groups: [etcd, cluster]
- name: etcd2
family: rhel
groups: [etcd, cluster]
- name: etcd3
family: debian12
family: debian1212
groups: [etcd, cluster]
- name: etcd4
family: rhel
groups: [etcd, cluster]
- name: etcd5
family: debian12
family: debian1212
groups: [etcd, cluster]
# Patroni кластер (3 узла PostgreSQL)
@@ -50,7 +57,7 @@ hosts:
family: rhel
groups: [patroni, database, cluster]
- name: patroni2
family: debian12
family: debian1212
groups: [patroni, database, cluster]
- name: patroni3
family: rhel
@@ -58,7 +65,7 @@ hosts:
# HAProxy для балансировки
- name: haproxy
family: debian12
family: debian1212
groups: [haproxy, loadbalancer]
publish: ["5000:5000", "5001:5001"] # RW и RO порты

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -30,16 +37,16 @@ systemd_defaults:
hosts:
# Debian серверы
- name: debian1
family: debian12
family: debian1212
groups: [debian, servers, web]
- name: debian2
family: debian12
family: debian1212
groups: [debian, servers, web]
- name: debian3
family: debian12
family: debian1212
groups: [debian, servers, app]
- name: debian4
family: debian12
family: debian1212
groups: [debian, servers, app]
# RHEL серверы
@@ -58,7 +65,7 @@ hosts:
# База данных на разных ОС
- name: db-debian
family: debian12
family: debian1212
groups: [database, debian, db]
- name: db-rhel
family: rhel
@@ -66,7 +73,7 @@ hosts:
# Load balancer
- name: lb-mixed
family: debian12
family: debian1212
groups: [loadbalancer, haproxy]
publish: ["80:80", "443:443"]

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -30,19 +37,19 @@ systemd_defaults:
hosts:
# Основные серверы (5 узлов)
- name: server1
family: debian12
family: debian1212
groups: [servers, web, app]
- name: server2
family: rhel
groups: [servers, web, app]
- name: server3
family: debian12
family: debian1212
groups: [servers, web, app]
- name: server4
family: rhel
groups: [servers, web, app]
- name: server5
family: debian12
family: debian1212
groups: [servers, web, app]
# База данных (3 узла)
@@ -50,7 +57,7 @@ hosts:
family: rhel
groups: [database, db]
- name: db2
family: debian12
family: debian1212
groups: [database, db]
- name: db3
family: rhel
@@ -58,13 +65,13 @@ hosts:
# Кэш (3 узла Redis)
- name: cache1
family: debian12
family: debian1212
groups: [cache, redis]
- name: cache2
family: rhel
groups: [cache, redis]
- name: cache3
family: debian12
family: debian1212
groups: [cache, redis]
# Load balancer

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -34,7 +41,7 @@ hosts:
groups: [bastion, security, jump]
publish: ["2222:22"]
- name: bastion2
family: debian12
family: debian1212
groups: [bastion, security, jump]
publish: ["2223:22"]
@@ -43,7 +50,7 @@ hosts:
family: rhel
groups: [internal, servers, app]
- name: internal2
family: debian12
family: debian1212
groups: [internal, servers, app]
- name: internal3
family: rhel
@@ -54,12 +61,12 @@ hosts:
family: rhel
groups: [database, secure, internal]
- name: db-secure2
family: debian12
family: debian1212
groups: [database, secure, internal]
# Мониторинг и логирование
- name: monitor1
family: debian12
family: debian1212
groups: [monitoring, security, logs]
- name: monitor2
family: rhel
@@ -70,13 +77,13 @@ hosts:
family: rhel
groups: [firewall, network, security]
- name: fw2
family: debian12
family: debian1212
groups: [firewall, network, security]
# DOoD узел для тестирования Docker безопасности
- name: docker-secure
type: dood
family: debian12
family: debian1212
groups: [docker, security, apps]
publish: ["8080:8080"]
env:

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -29,8 +36,8 @@ systemd_defaults:
hosts:
# Стабильные ОС для надежного тестирования
- name: u1
family: ubuntu22
family: ubuntu2222
groups: [test, web]
- name: u2
family: debian12
family: debian1212
groups: [test, web]

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -29,11 +36,11 @@ systemd_defaults:
hosts:
# Стандартный набор - 3 хоста
- name: u1
family: debian12
family: debian1212
groups: [test]
- name: u2
family: rhel
groups: [test]
- name: u3
family: debian12
family: debian1212
groups: [test]

View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest"
astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest"
centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-latest"
alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-latest"
redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest"
debian: "inecs/ansible-lab:debian-latest"
ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
ubuntu22: "inecs/ansible-lab:ubuntu22-latest"
ubuntu24: "inecs/ansible-lab:ubuntu24-latest"
debian9: "inecs/ansible-lab:debian9-latest"
debian10: "inecs/ansible-lab:debian10-latest"
debian11: "inecs/ansible-lab:debian11-latest"
debian12: "inecs/ansible-lab:debian12-latest"
systemd_defaults:
privileged: true
@@ -29,5 +36,5 @@ systemd_defaults:
hosts:
# Минимальный набор - один хост
- name: u1
family: debian12
family: debian1212
groups: [test]