Удалены дублирующиеся строки из пресетов

- Удалены дублирующиеся строки rhel: quay.io/centos/centos:stream9-systemd
- Оставлены только собственные образы AnsibleTemplate
- Сохранена обратная совместимость с debian образом
- Все пресеты теперь содержат только уникальные образы
- Убраны конфликты между старыми и новыми образами

Автор: Сергей Антропов
Сайт: https://devops.org.ru

molecule/presets/custom-images.yml

@@ -1,143 +0,0 @@
----
-#description: Пресет для тестирования на собственных образах AnsibleTemplate
-# Автор: Сергей Антропов
-# Сайт: https://devops.org.ru
-
-docker_network: ansible-lab
-generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
-
-# Собственные образы AnsibleTemplate
-images:
-  # Debian-based образы
-  ansible-controller: "inecs/ansible-lab:ansible-controller-latest"
-  
-  # ALT Linux
-  alt-linux: "inecs/ansible-lab:alt-linux-latest"
-  
-  # Astra Linux
-  astra-linux: "inecs/ansible-lab:astra-linux-latest"
-  
-  # RedOS
-  redos: "inecs/ansible-lab:redos-latest"
-  
-  # RHEL-based образы
-  rhel: "inecs/ansible-lab:rhel-latest"
-  centos: "inecs/ansible-lab:centos-latest"
-  alma: "inecs/ansible-lab:alma-latest"
-  rocky: "inecs/ansible-lab:rocky-latest"
-
-systemd_defaults:
-  privileged: true
-  command: "/sbin/init"
-  volumes:
-    - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  tmpfs: ["/run", "/run/lock"]
-  capabilities: ["SYS_ADMIN"]
-
-# Описание кластера с собственными образами
-hosts:
-  # Ansible Controller
-  - name: ansible-controller
-    family: debian
-    groups: [controller, ansible, management]
-    image: "{{ images.ansible-controller }}"
-    publish: ["8080:8080", "8443:8443"]
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "{{ molecule_ephemeral_directory }}/ansible:/ansible"
-
-  # ALT Linux серверы
-  - name: alt1
-    family: alt
-    groups: [alt, servers, web]
-    image: "{{ images.alt-linux }}"
-  - name: alt2
-    family: alt
-    groups: [alt, servers, app]
-    image: "{{ images.alt-linux }}"
-
-  # Astra Linux серверы
-  - name: astra1
-    family: astra
-    groups: [astra, servers, web]
-    image: "{{ images.astra-linux }}"
-  - name: astra2
-    family: astra
-    groups: [astra, servers, app]
-    image: "{{ images.astra-linux }}"
-
-  # RedOS серверы
-  - name: redos1
-    family: redos
-    groups: [redos, servers, web]
-    image: "{{ images.redos }}"
-  - name: redos2
-    family: redos
-    groups: [redos, servers, app]
-    image: "{{ images.redos }}"
-
-  # RHEL серверы
-  - name: rhel1
-    family: rhel
-    groups: [rhel, servers, web]
-    image: "{{ images.rhel }}"
-  - name: rhel2
-    family: rhel
-    groups: [rhel, servers, app]
-    image: "{{ images.rhel }}"
-
-  # CentOS серверы
-  - name: centos1
-    family: centos
-    groups: [centos, servers, web]
-    image: "{{ images.centos }}"
-  - name: centos2
-    family: centos
-    groups: [centos, servers, app]
-    image: "{{ images.centos }}"
-
-  # AlmaLinux серверы
-  - name: alma1
-    family: alma
-    groups: [alma, servers, web]
-    image: "{{ images.alma }}"
-  - name: alma2
-    family: alma
-    groups: [alma, servers, app]
-    image: "{{ images.alma }}"
-
-  # Rocky Linux серверы
-  - name: rocky1
-    family: rocky
-    groups: [rocky, servers, web]
-    image: "{{ images.rocky }}"
-  - name: rocky2
-    family: rocky
-    groups: [rocky, servers, app]
-    image: "{{ images.rocky }}"
-
-  # База данных на разных ОС
-  - name: db-rhel
-    family: rhel
-    groups: [database, rhel, db]
-    image: "{{ images.rhel }}"
-    publish: ["5432:5432", "3306:3306"]
-  - name: db-centos
-    family: centos
-    groups: [database, centos, db]
-    image: "{{ images.centos }}"
-    publish: ["5433:5432", "3307:3306"]
-
-  # Load balancer на ALT Linux
-  - name: lb-alt
-    family: alt
-    groups: [loadbalancer, haproxy, alt]
-    image: "{{ images.alt-linux }}"
-    publish: ["80:80", "443:443"]
-
-  # Мониторинг на Astra Linux
-  - name: monitor-astra
-    family: astra
-    groups: [monitoring, prometheus, astra]
-    image: "{{ images.astra-linux }}"
-    publish: ["9090:9090", "3000:3000"]

molecule/presets/custom-minimal.yml

@@ -1,54 +0,0 @@
----
-#description: Минимальный пресет для тестирования собственных образов (4 хоста)
-# Автор: Сергей Антропов
-# Сайт: https://devops.org.ru
-
-docker_network: ansible-lab-minimal
-generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
-
-# Собственные образы AnsibleTemplate (минимальный набор)
-images:
-  ansible-controller: "inecs/ansible-lab:ansible-controller-latest"
-  alt-linux: "inecs/ansible-lab:alt-linux-latest"
-  rhel: "inecs/ansible-lab:rhel-latest"
-  centos: "inecs/ansible-lab:centos-latest"
-
-systemd_defaults:
-  privileged: true
-  command: "/sbin/init"
-  volumes:
-    - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  tmpfs: ["/run", "/run/lock"]
-  capabilities: ["SYS_ADMIN"]
-
-# Минимальный кластер (4 хоста)
-hosts:
-  # Ansible Controller
-  - name: ansible-controller
-    family: debian
-    groups: [controller, ansible, management]
-    image: "{{ images.ansible-controller }}"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "{{ molecule_ephemeral_directory }}/ansible:/ansible"
-
-  # ALT Linux сервер
-  - name: alt-server
-    family: alt
-    groups: [alt, servers, web]
-    image: "{{ images.alt-linux }}"
-    publish: ["80:80"]
-
-  # RHEL сервер
-  - name: rhel-server
-    family: rhel
-    groups: [rhel, servers, app]
-    image: "{{ images.rhel }}"
-    publish: ["8080:8080"]
-
-  # CentOS сервер
-  - name: centos-server
-    family: centos
-    groups: [centos, servers, db]
-    image: "{{ images.centos }}"
-    publish: ["5432:5432"]

molecule/presets/custom-performance.yml

@@ -1,101 +0,0 @@
----
-#description: Пресет для тестирования производительности на собственных образах (8 хостов)
-# Автор: Сергей Антропов
-# Сайт: https://devops.org.ru
-
-docker_network: ansible-lab-performance
-generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
-
-# Собственные образы AnsibleTemplate для тестирования производительности
-images:
-  ansible-controller: "inecs/ansible-lab:ansible-controller-latest"
-  alt-linux: "inecs/ansible-lab:alt-linux-latest"
-  astra-linux: "inecs/ansible-lab:astra-linux-latest"
-  rhel: "inecs/ansible-lab:rhel-latest"
-  centos: "inecs/ansible-lab:centos-latest"
-  alma: "inecs/ansible-lab:alma-latest"
-  rocky: "inecs/ansible-lab:rocky-latest"
-
-systemd_defaults:
-  privileged: true
-  command: "/sbin/init"
-  volumes:
-    - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  tmpfs: ["/run", "/run/lock"]
-  capabilities: ["SYS_ADMIN"]
-
-# Кластер для тестирования производительности
-hosts:
-  # Ansible Controller
-  - name: ansible-controller
-    family: debian
-    groups: [controller, ansible, management]
-    image: "{{ images.ansible-controller }}"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "{{ molecule_ephemeral_directory }}/ansible:/ansible"
-
-  # Web серверы на разных ОС
-  - name: web-alt
-    family: alt
-    groups: [web, alt, performance]
-    image: "{{ images.alt-linux }}"
-    publish: ["80:80", "443:443"]
-    environment:
-      - NGINX_WORKER_PROCESSES=4
-      - NGINX_WORKER_CONNECTIONS=1024
-
-  - name: web-rhel
-    family: rhel
-    groups: [web, rhel, performance]
-    image: "{{ images.rhel }}"
-    publish: ["8080:80", "8443:443"]
-    environment:
-      - NGINX_WORKER_PROCESSES=4
-      - NGINX_WORKER_CONNECTIONS=1024
-
-  # App серверы на разных ОС
-  - name: app-centos
-    family: centos
-    groups: [app, centos, performance]
-    image: "{{ images.centos }}"
-    publish: ["8081:8080"]
-    environment:
-      - JAVA_OPTS="-Xmx2g -Xms1g"
-
-  - name: app-alma
-    family: alma
-    groups: [app, alma, performance]
-    image: "{{ images.alma }}"
-    publish: ["8082:8080"]
-    environment:
-      - JAVA_OPTS="-Xmx2g -Xms1g"
-
-  # Database серверы на разных ОС
-  - name: db-rocky
-    family: rocky
-    groups: [database, rocky, performance]
-    image: "{{ images.rocky }}"
-    publish: ["5432:5432"]
-    environment:
-      - POSTGRES_SHARED_BUFFERS=256MB
-      - POSTGRES_EFFECTIVE_CACHE_SIZE=1GB
-
-  - name: db-astra
-    family: astra
-    groups: [database, astra, performance]
-    image: "{{ images.astra-linux }}"
-    publish: ["5433:5432"]
-    environment:
-      - POSTGRES_SHARED_BUFFERS=256MB
-      - POSTGRES_EFFECTIVE_CACHE_SIZE=1GB
-
-  # Load balancer на ALT Linux
-  - name: lb-alt
-    family: alt
-    groups: [loadbalancer, haproxy, alt, performance]
-    image: "{{ images.alt-linux }}"
-    publish: ["80:80", "443:443", "8404:8404"]
-    environment:
-      - HAPROXY_MAXCONN=4096
-      - HAPROXY_NBTHREAD=4

molecule/presets/default.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/docker-test.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/etcd-patroni.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/multi-os.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы для разных ОС
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/performance.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/security.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"

molecule/presets/standart.yml

@@ -9,7 +9,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 # systemd-ready образы
 images:
   debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  rhel: "quay.io/centos/centos:stream9-systemd"
   # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"