Исправлены опечатки в family: debian1212 → debian12 и ubuntu2222 → ubuntu22
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
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
This commit is contained in:
@@ -46,7 +46,7 @@ hosts:
|
|||||||
TEST_FAMILY: "Debian"
|
TEST_FAMILY: "Debian"
|
||||||
|
|
||||||
- name: ubuntu22-test
|
- name: ubuntu22-test
|
||||||
family: ubuntu2222
|
family: ubuntu22
|
||||||
groups: [test, debian, ubuntu]
|
groups: [test, debian, ubuntu]
|
||||||
publish:
|
publish:
|
||||||
- "8081:80"
|
- "8081:80"
|
||||||
@@ -91,7 +91,7 @@ hosts:
|
|||||||
TEST_FAMILY: "Debian"
|
TEST_FAMILY: "Debian"
|
||||||
|
|
||||||
- name: debian12-test
|
- name: debian12-test
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test, debian]
|
groups: [test, debian]
|
||||||
publish:
|
publish:
|
||||||
- "8086:80"
|
- "8086:80"
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Стандартный набор - 2 хоста для базового тестирования (стабильные ОС)
|
# Стандартный набор - 2 хоста для базового тестирования (стабильные ОС)
|
||||||
- name: u1
|
- name: u1
|
||||||
family: ubuntu2222
|
family: ubuntu22
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
- name: u2
|
- name: u2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
@@ -36,10 +36,10 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Базовые хосты (стабильные ОС)
|
# Базовые хосты (стабильные ОС)
|
||||||
- name: u1
|
- name: u1
|
||||||
family: ubuntu2222
|
family: ubuntu22
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
- name: u2
|
- name: u2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
|
|
||||||
# DinD узел (Docker-in-Docker)
|
# DinD узел (Docker-in-Docker)
|
||||||
@@ -51,7 +51,7 @@ hosts:
|
|||||||
# DOoD узел (Docker-out-of-Docker)
|
# DOoD узел (Docker-out-of-Docker)
|
||||||
- name: dood1
|
- name: dood1
|
||||||
type: dood
|
type: dood
|
||||||
family: ubuntu2222
|
family: ubuntu22
|
||||||
groups: [dood]
|
groups: [dood]
|
||||||
publish: ["8081:8081"]
|
publish: ["8081:8081"]
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Тестовые хосты
|
# Тестовые хосты
|
||||||
- name: test1
|
- name: test1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test]
|
groups: [test]
|
||||||
- name: test2
|
- name: test2
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -51,7 +51,7 @@ hosts:
|
|||||||
# DOoD узел (Docker-out-of-Docker)
|
# DOoD узел (Docker-out-of-Docker)
|
||||||
- name: dood1
|
- name: dood1
|
||||||
type: dood
|
type: dood
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [dood]
|
groups: [dood]
|
||||||
publish: ["8081:8081"]
|
publish: ["8081:8081"]
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -37,19 +37,19 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# ETCD кластер (5 узлов для высокой доступности)
|
# ETCD кластер (5 узлов для высокой доступности)
|
||||||
- name: etcd1
|
- name: etcd1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [etcd, cluster]
|
groups: [etcd, cluster]
|
||||||
- name: etcd2
|
- name: etcd2
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [etcd, cluster]
|
groups: [etcd, cluster]
|
||||||
- name: etcd3
|
- name: etcd3
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [etcd, cluster]
|
groups: [etcd, cluster]
|
||||||
- name: etcd4
|
- name: etcd4
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [etcd, cluster]
|
groups: [etcd, cluster]
|
||||||
- name: etcd5
|
- name: etcd5
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [etcd, cluster]
|
groups: [etcd, cluster]
|
||||||
|
|
||||||
# Patroni кластер (3 узла PostgreSQL)
|
# Patroni кластер (3 узла PostgreSQL)
|
||||||
@@ -57,7 +57,7 @@ hosts:
|
|||||||
family: rhel
|
family: rhel
|
||||||
groups: [patroni, database, cluster]
|
groups: [patroni, database, cluster]
|
||||||
- name: patroni2
|
- name: patroni2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [patroni, database, cluster]
|
groups: [patroni, database, cluster]
|
||||||
- name: patroni3
|
- name: patroni3
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -65,7 +65,7 @@ hosts:
|
|||||||
|
|
||||||
# HAProxy для балансировки
|
# HAProxy для балансировки
|
||||||
- name: haproxy
|
- name: haproxy
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [haproxy, loadbalancer]
|
groups: [haproxy, loadbalancer]
|
||||||
publish: ["5000:5000", "5001:5001"] # RW и RO порты
|
publish: ["5000:5000", "5001:5001"] # RW и RO порты
|
||||||
|
|
||||||
|
|||||||
@@ -37,16 +37,16 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Debian серверы
|
# Debian серверы
|
||||||
- name: debian1
|
- name: debian1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [debian, servers, web]
|
groups: [debian, servers, web]
|
||||||
- name: debian2
|
- name: debian2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [debian, servers, web]
|
groups: [debian, servers, web]
|
||||||
- name: debian3
|
- name: debian3
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [debian, servers, app]
|
groups: [debian, servers, app]
|
||||||
- name: debian4
|
- name: debian4
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [debian, servers, app]
|
groups: [debian, servers, app]
|
||||||
|
|
||||||
# RHEL серверы
|
# RHEL серверы
|
||||||
@@ -65,7 +65,7 @@ hosts:
|
|||||||
|
|
||||||
# База данных на разных ОС
|
# База данных на разных ОС
|
||||||
- name: db-debian
|
- name: db-debian
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [database, debian, db]
|
groups: [database, debian, db]
|
||||||
- name: db-rhel
|
- name: db-rhel
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -73,7 +73,7 @@ hosts:
|
|||||||
|
|
||||||
# Load balancer
|
# Load balancer
|
||||||
- name: lb-mixed
|
- name: lb-mixed
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [loadbalancer, haproxy]
|
groups: [loadbalancer, haproxy]
|
||||||
publish: ["80:80", "443:443"]
|
publish: ["80:80", "443:443"]
|
||||||
|
|
||||||
|
|||||||
@@ -37,19 +37,19 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Основные серверы (5 узлов)
|
# Основные серверы (5 узлов)
|
||||||
- name: server1
|
- name: server1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [servers, web, app]
|
groups: [servers, web, app]
|
||||||
- name: server2
|
- name: server2
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [servers, web, app]
|
groups: [servers, web, app]
|
||||||
- name: server3
|
- name: server3
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [servers, web, app]
|
groups: [servers, web, app]
|
||||||
- name: server4
|
- name: server4
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [servers, web, app]
|
groups: [servers, web, app]
|
||||||
- name: server5
|
- name: server5
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [servers, web, app]
|
groups: [servers, web, app]
|
||||||
|
|
||||||
# База данных (3 узла)
|
# База данных (3 узла)
|
||||||
@@ -57,7 +57,7 @@ hosts:
|
|||||||
family: rhel
|
family: rhel
|
||||||
groups: [database, db]
|
groups: [database, db]
|
||||||
- name: db2
|
- name: db2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [database, db]
|
groups: [database, db]
|
||||||
- name: db3
|
- name: db3
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -65,13 +65,13 @@ hosts:
|
|||||||
|
|
||||||
# Кэш (3 узла Redis)
|
# Кэш (3 узла Redis)
|
||||||
- name: cache1
|
- name: cache1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [cache, redis]
|
groups: [cache, redis]
|
||||||
- name: cache2
|
- name: cache2
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [cache, redis]
|
groups: [cache, redis]
|
||||||
- name: cache3
|
- name: cache3
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [cache, redis]
|
groups: [cache, redis]
|
||||||
|
|
||||||
# Load balancer
|
# Load balancer
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ hosts:
|
|||||||
groups: [bastion, security, jump]
|
groups: [bastion, security, jump]
|
||||||
publish: ["2222:22"]
|
publish: ["2222:22"]
|
||||||
- name: bastion2
|
- name: bastion2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [bastion, security, jump]
|
groups: [bastion, security, jump]
|
||||||
publish: ["2223:22"]
|
publish: ["2223:22"]
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ hosts:
|
|||||||
family: rhel
|
family: rhel
|
||||||
groups: [internal, servers, app]
|
groups: [internal, servers, app]
|
||||||
- name: internal2
|
- name: internal2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [internal, servers, app]
|
groups: [internal, servers, app]
|
||||||
- name: internal3
|
- name: internal3
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -61,12 +61,12 @@ hosts:
|
|||||||
family: rhel
|
family: rhel
|
||||||
groups: [database, secure, internal]
|
groups: [database, secure, internal]
|
||||||
- name: db-secure2
|
- name: db-secure2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [database, secure, internal]
|
groups: [database, secure, internal]
|
||||||
|
|
||||||
# Мониторинг и логирование
|
# Мониторинг и логирование
|
||||||
- name: monitor1
|
- name: monitor1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [monitoring, security, logs]
|
groups: [monitoring, security, logs]
|
||||||
- name: monitor2
|
- name: monitor2
|
||||||
family: rhel
|
family: rhel
|
||||||
@@ -77,13 +77,13 @@ hosts:
|
|||||||
family: rhel
|
family: rhel
|
||||||
groups: [firewall, network, security]
|
groups: [firewall, network, security]
|
||||||
- name: fw2
|
- name: fw2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [firewall, network, security]
|
groups: [firewall, network, security]
|
||||||
|
|
||||||
# DOoD узел для тестирования Docker безопасности
|
# DOoD узел для тестирования Docker безопасности
|
||||||
- name: docker-secure
|
- name: docker-secure
|
||||||
type: dood
|
type: dood
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [docker, security, apps]
|
groups: [docker, security, apps]
|
||||||
publish: ["8080:8080"]
|
publish: ["8080:8080"]
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Стабильные ОС для надежного тестирования
|
# Стабильные ОС для надежного тестирования
|
||||||
- name: u1
|
- name: u1
|
||||||
family: ubuntu2222
|
family: ubuntu22
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
- name: u2
|
- name: u2
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test, web]
|
groups: [test, web]
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Стандартный набор - 3 хоста
|
# Стандартный набор - 3 хоста
|
||||||
- name: u1
|
- name: u1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test]
|
groups: [test]
|
||||||
- name: u2
|
- name: u2
|
||||||
family: rhel
|
family: rhel
|
||||||
groups: [test]
|
groups: [test]
|
||||||
- name: u3
|
- name: u3
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test]
|
groups: [test]
|
||||||
|
|||||||
@@ -36,5 +36,5 @@ systemd_defaults:
|
|||||||
hosts:
|
hosts:
|
||||||
# Минимальный набор - один хост
|
# Минимальный набор - один хост
|
||||||
- name: u1
|
- name: u1
|
||||||
family: debian1212
|
family: debian12
|
||||||
groups: [test]
|
groups: [test]
|
||||||
|
|||||||
Reference in New Issue
Block a user