diff --git a/molecule/presets/all-images.yml b/molecule/presets/all-images.yml index a0c39bd..7d2ec14 100644 --- a/molecule/presets/all-images.yml +++ b/molecule/presets/all-images.yml @@ -46,7 +46,7 @@ hosts: TEST_FAMILY: "Debian" - name: ubuntu22-test - family: ubuntu2222 + family: ubuntu22 groups: [test, debian, ubuntu] publish: - "8081:80" @@ -91,7 +91,7 @@ hosts: TEST_FAMILY: "Debian" - name: debian12-test - family: debian1212 + family: debian12 groups: [test, debian] publish: - "8086:80" diff --git a/molecule/presets/default.yml b/molecule/presets/default.yml index ae06c01..66bb22b 100644 --- a/molecule/presets/default.yml +++ b/molecule/presets/default.yml @@ -36,8 +36,8 @@ systemd_defaults: hosts: # Стандартный набор - 2 хоста для базового тестирования (стабильные ОС) - name: u1 - family: ubuntu2222 + family: ubuntu22 groups: [test, web] - name: u2 - family: debian1212 + family: debian12 groups: [test, web] \ No newline at end of file diff --git a/molecule/presets/docker-full.yml b/molecule/presets/docker-full.yml index d104fc7..22adf6d 100644 --- a/molecule/presets/docker-full.yml +++ b/molecule/presets/docker-full.yml @@ -36,10 +36,10 @@ systemd_defaults: hosts: # Базовые хосты (стабильные ОС) - name: u1 - family: ubuntu2222 + family: ubuntu22 groups: [test, web] - name: u2 - family: debian1212 + family: debian12 groups: [test, web] # DinD узел (Docker-in-Docker) @@ -51,7 +51,7 @@ hosts: # DOoD узел (Docker-out-of-Docker) - name: dood1 type: dood - family: ubuntu2222 + family: ubuntu22 groups: [dood] publish: ["8081:8081"] env: diff --git a/molecule/presets/docker-test.yml b/molecule/presets/docker-test.yml index 2c8d0d8..af5925a 100644 --- a/molecule/presets/docker-test.yml +++ b/molecule/presets/docker-test.yml @@ -36,7 +36,7 @@ systemd_defaults: hosts: # Тестовые хосты - name: test1 - family: debian1212 + family: debian12 groups: [test] - name: test2 family: rhel @@ -51,7 +51,7 @@ hosts: # DOoD узел (Docker-out-of-Docker) - name: dood1 type: dood - family: debian1212 + family: debian12 groups: [dood] publish: ["8081:8081"] env: diff --git a/molecule/presets/etcd-patroni.yml b/molecule/presets/etcd-patroni.yml index ed4292a..69ae07f 100644 --- a/molecule/presets/etcd-patroni.yml +++ b/molecule/presets/etcd-patroni.yml @@ -37,19 +37,19 @@ systemd_defaults: hosts: # ETCD кластер (5 узлов для высокой доступности) - name: etcd1 - family: debian1212 + family: debian12 groups: [etcd, cluster] - name: etcd2 family: rhel groups: [etcd, cluster] - name: etcd3 - family: debian1212 + family: debian12 groups: [etcd, cluster] - name: etcd4 family: rhel groups: [etcd, cluster] - name: etcd5 - family: debian1212 + family: debian12 groups: [etcd, cluster] # Patroni кластер (3 узла PostgreSQL) @@ -57,7 +57,7 @@ hosts: family: rhel groups: [patroni, database, cluster] - name: patroni2 - family: debian1212 + family: debian12 groups: [patroni, database, cluster] - name: patroni3 family: rhel @@ -65,7 +65,7 @@ hosts: # HAProxy для балансировки - name: haproxy - family: debian1212 + family: debian12 groups: [haproxy, loadbalancer] publish: ["5000:5000", "5001:5001"] # RW и RO порты diff --git a/molecule/presets/multi-os.yml b/molecule/presets/multi-os.yml index de2f4f0..f0073cc 100644 --- a/molecule/presets/multi-os.yml +++ b/molecule/presets/multi-os.yml @@ -37,16 +37,16 @@ systemd_defaults: hosts: # Debian серверы - name: debian1 - family: debian1212 + family: debian12 groups: [debian, servers, web] - name: debian2 - family: debian1212 + family: debian12 groups: [debian, servers, web] - name: debian3 - family: debian1212 + family: debian12 groups: [debian, servers, app] - name: debian4 - family: debian1212 + family: debian12 groups: [debian, servers, app] # RHEL серверы @@ -65,7 +65,7 @@ hosts: # База данных на разных ОС - name: db-debian - family: debian1212 + family: debian12 groups: [database, debian, db] - name: db-rhel family: rhel @@ -73,7 +73,7 @@ hosts: # Load balancer - name: lb-mixed - family: debian1212 + family: debian12 groups: [loadbalancer, haproxy] publish: ["80:80", "443:443"] diff --git a/molecule/presets/performance.yml b/molecule/presets/performance.yml index 94e40ee..477a431 100644 --- a/molecule/presets/performance.yml +++ b/molecule/presets/performance.yml @@ -37,19 +37,19 @@ systemd_defaults: hosts: # Основные серверы (5 узлов) - name: server1 - family: debian1212 + family: debian12 groups: [servers, web, app] - name: server2 family: rhel groups: [servers, web, app] - name: server3 - family: debian1212 + family: debian12 groups: [servers, web, app] - name: server4 family: rhel groups: [servers, web, app] - name: server5 - family: debian1212 + family: debian12 groups: [servers, web, app] # База данных (3 узла) @@ -57,7 +57,7 @@ hosts: family: rhel groups: [database, db] - name: db2 - family: debian1212 + family: debian12 groups: [database, db] - name: db3 family: rhel @@ -65,13 +65,13 @@ hosts: # Кэш (3 узла Redis) - name: cache1 - family: debian1212 + family: debian12 groups: [cache, redis] - name: cache2 family: rhel groups: [cache, redis] - name: cache3 - family: debian1212 + family: debian12 groups: [cache, redis] # Load balancer diff --git a/molecule/presets/security.yml b/molecule/presets/security.yml index da171f9..82f3006 100644 --- a/molecule/presets/security.yml +++ b/molecule/presets/security.yml @@ -41,7 +41,7 @@ hosts: groups: [bastion, security, jump] publish: ["2222:22"] - name: bastion2 - family: debian1212 + family: debian12 groups: [bastion, security, jump] publish: ["2223:22"] @@ -50,7 +50,7 @@ hosts: family: rhel groups: [internal, servers, app] - name: internal2 - family: debian1212 + family: debian12 groups: [internal, servers, app] - name: internal3 family: rhel @@ -61,12 +61,12 @@ hosts: family: rhel groups: [database, secure, internal] - name: db-secure2 - family: debian1212 + family: debian12 groups: [database, secure, internal] # Мониторинг и логирование - name: monitor1 - family: debian1212 + family: debian12 groups: [monitoring, security, logs] - name: monitor2 family: rhel @@ -77,13 +77,13 @@ hosts: family: rhel groups: [firewall, network, security] - name: fw2 - family: debian1212 + family: debian12 groups: [firewall, network, security] # DOoD узел для тестирования Docker безопасности - name: docker-secure type: dood - family: debian1212 + family: debian12 groups: [docker, security, apps] publish: ["8080:8080"] env: diff --git a/molecule/presets/stable.yml b/molecule/presets/stable.yml index 71ecfd1..50ec4eb 100644 --- a/molecule/presets/stable.yml +++ b/molecule/presets/stable.yml @@ -36,8 +36,8 @@ systemd_defaults: hosts: # Стабильные ОС для надежного тестирования - name: u1 - family: ubuntu2222 + family: ubuntu22 groups: [test, web] - name: u2 - family: debian1212 + family: debian12 groups: [test, web] diff --git a/molecule/presets/standart.yml b/molecule/presets/standart.yml index 56f6463..6044d61 100644 --- a/molecule/presets/standart.yml +++ b/molecule/presets/standart.yml @@ -36,11 +36,11 @@ systemd_defaults: hosts: # Стандартный набор - 3 хоста - name: u1 - family: debian1212 + family: debian12 groups: [test] - name: u2 family: rhel groups: [test] - name: u3 - family: debian1212 + family: debian12 groups: [test] diff --git a/molecule/presets/test.yml b/molecule/presets/test.yml index 3135867..f6e8ee7 100644 --- a/molecule/presets/test.yml +++ b/molecule/presets/test.yml @@ -36,5 +36,5 @@ systemd_defaults: hosts: # Минимальный набор - один хост - name: u1 - family: debian1212 + family: debian12 groups: [test]