From cb9eec8e382d064acd06ec0d6e1e780cd3a60c69 Mon Sep 17 00:00:00 2001 From: Vitaliy Kukharik Date: Fri, 3 Mar 2023 16:12:25 +0300 Subject: [PATCH] molecule: reduce the number of docker containers reduce the number of docker containers to save resources during tests. --- molecule/default/molecule.yml | 80 ++++++--------------- molecule/postgrespro/molecule.yml | 114 +++++++++++++----------------- 2 files changed, 71 insertions(+), 123 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 26800f1c0..8d5e04699 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -6,8 +6,8 @@ dependency: driver: name: docker platforms: - - name: 10.172.0.17 - hostname: dcs-node01 + - name: 10.172.0.20 + hostname: pgnode01 image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" # docker_networks: # TODO github.com/ansible-community/molecule/pull/2696 # - name: test_docker_network @@ -16,7 +16,7 @@ platforms: # gateway: 10.172.0.1 networks: - name: test_docker_network - ipv4_address: 10.172.0.17 + ipv4_address: 10.172.0.20 exposed_ports: - 2379/tcp # if dcs_type: "etcd" - 2380/tcp # if dcs_type: "etcd" @@ -25,6 +25,9 @@ platforms: - 8302/tcp # if dcs_type: "consul" - 8500/tcp # if dcs_type: "consul" - 8600/tcp # if dcs_type: "consul" + - 8008/tcp + - 5432/tcp + - 6432/tcp command: "" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw @@ -34,13 +37,16 @@ platforms: groups: - etcd_cluster # if dcs_type: "etcd" - consul_instances # if dcs_type: "consul" + - master + - postgres_cluster + - balancers - - name: 10.172.0.18 - hostname: dcs-node02 + - name: 10.172.0.21 + hostname: pgnode02 image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" networks: - name: test_docker_network - ipv4_address: 10.172.0.18 + ipv4_address: 10.172.0.21 exposed_ports: - 2379/tcp - 2380/tcp @@ -49,6 +55,9 @@ platforms: - 8302/tcp - 8500/tcp - 8600/tcp + - 8008/tcp + - 5432/tcp + - 6432/tcp command: "" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw @@ -58,13 +67,16 @@ platforms: groups: - etcd_cluster - consul_instances + - replica + - postgres_cluster + - balancers - - name: 10.172.0.19 - hostname: dcs-node03 + - name: 10.172.0.22 + hostname: pgnode03 image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" networks: - name: test_docker_network - ipv4_address: 10.172.0.19 + ipv4_address: 10.172.0.22 exposed_ports: - 2379/tcp - 2380/tcp @@ -73,31 +85,9 @@ platforms: - 8302/tcp - 8500/tcp - 8600/tcp - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - privileged: true - pre_build_image: true - groups: - - etcd_cluster - - consul_instances - - - name: 10.172.0.20 - hostname: pgnode01 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" - networks: - - name: test_docker_network - ipv4_address: 10.172.0.20 - exposed_ports: - 8008/tcp - 5432/tcp - 6432/tcp - - 8300/tcp # if dcs_type: "consul" - - 8301/tcp # if dcs_type: "consul" - - 8302/tcp # if dcs_type: "consul" - - 8500/tcp # if dcs_type: "consul" - - 8600/tcp # if dcs_type: "consul" command: "" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw @@ -105,37 +95,11 @@ platforms: privileged: true pre_build_image: true groups: - - master - - postgres_cluster - - balancers + - etcd_cluster - consul_instances - - - name: 10.172.0.21 - hostname: pgnode02 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" - networks: - - name: test_docker_network - ipv4_address: 10.172.0.21 - exposed_ports: - - 8008/tcp - - 5432/tcp - - 6432/tcp - - 8300/tcp - - 8301/tcp - - 8302/tcp - - 8500/tcp - - 8600/tcp - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - privileged: true - pre_build_image: true - groups: - replica - postgres_cluster - balancers - - consul_instances provisioner: name: ansible diff --git a/molecule/postgrespro/molecule.yml b/molecule/postgrespro/molecule.yml index 6aa7ad4a8..85072d126 100644 --- a/molecule/postgrespro/molecule.yml +++ b/molecule/postgrespro/molecule.yml @@ -6,76 +6,55 @@ dependency: driver: name: docker platforms: - - name: 10.172.1.17 - hostname: etcd01 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-centos8}-ansible:${IMAGE_TAG:-latest}" - networks: - - name: test_docker_network - ipv4_address: 10.172.1.17 - exposed_ports: - - 2379/tcp - - 2380/tcp - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - privileged: true - pre_build_image: true - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 - groups: - - etcd_cluster - - - name: 10.172.1.18 - hostname: etcd02 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-centos8}-ansible:${IMAGE_TAG:-latest}" + - name: 10.172.1.20 + hostname: pgnode01 + image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" + # docker_networks: # TODO github.com/ansible-community/molecule/pull/2696 + # - name: test_docker_network + # ipam_config: + # - subnet: 10.172.0.0/24 + # gateway: 10.172.0.1 networks: - name: test_docker_network - ipv4_address: 10.172.1.18 + ipv4_address: 10.172.1.20 exposed_ports: - - 2379/tcp - - 2380/tcp + - 2379/tcp # if dcs_type: "etcd" + - 2380/tcp # if dcs_type: "etcd" + - 8300/tcp # if dcs_type: "consul" + - 8301/tcp # if dcs_type: "consul" + - 8302/tcp # if dcs_type: "consul" + - 8500/tcp # if dcs_type: "consul" + - 8600/tcp # if dcs_type: "consul" + - 8008/tcp + - 5432/tcp + - 6432/tcp command: "" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw cgroupns_mode: host privileged: true pre_build_image: true - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 groups: - - etcd_cluster + - etcd_cluster # if dcs_type: "etcd" + - consul_instances # if dcs_type: "consul" + - master + - postgres_cluster + - balancers - - name: 10.172.1.19 - hostname: etcd03 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-centos8}-ansible:${IMAGE_TAG:-latest}" + - name: 10.172.1.21 + hostname: pgnode02 + image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" networks: - name: test_docker_network - ipv4_address: 10.172.1.19 + ipv4_address: 10.172.1.21 exposed_ports: - 2379/tcp - 2380/tcp - command: "" - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - privileged: true - pre_build_image: true - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 - groups: - - etcd_cluster - - - name: 10.172.1.20 - hostname: pgnode01 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-centos8}-ansible:${IMAGE_TAG:-latest}" - networks: - - name: test_docker_network - ipv4_address: 10.172.1.20 - exposed_ports: + - 8300/tcp + - 8301/tcp + - 8302/tcp + - 8500/tcp + - 8600/tcp - 8008/tcp - 5432/tcp - 6432/tcp @@ -85,21 +64,27 @@ platforms: cgroupns_mode: host privileged: true pre_build_image: true - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 groups: - - master + - etcd_cluster + - consul_instances + - replica - postgres_cluster - balancers - - name: 10.172.1.21 - hostname: pgnode02 - image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-centos8}-ansible:${IMAGE_TAG:-latest}" + - name: 10.172.1.22 + hostname: pgnode03 + image: "${IMAGE_NAMESPACE:-geerlingguy}/docker-${IMAGE_DISTRO:-ubuntu2204}-ansible:${IMAGE_TAG:-latest}" networks: - name: test_docker_network - ipv4_address: 10.172.1.21 + ipv4_address: 10.172.1.22 exposed_ports: + - 2379/tcp + - 2380/tcp + - 8300/tcp + - 8301/tcp + - 8302/tcp + - 8500/tcp + - 8600/tcp - 8008/tcp - 5432/tcp - 6432/tcp @@ -109,10 +94,9 @@ platforms: cgroupns_mode: host privileged: true pre_build_image: true - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 groups: + - etcd_cluster + - consul_instances - replica - postgres_cluster - balancers