From 6aa7050acde21e26de908f226f810192f32b424b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 28 Sep 2017 14:14:38 +0200 Subject: [PATCH] tests: make all subnet uniq per scenario If two environments are using the same subnet, we will get trouble because of ips addresses conflicts. This commit ensures each scenario has a uniq subnet for both public and cluster network so we can setup several test environment at a time on a same hypervisor. Signed-off-by: Guillaume Abrioux --- tests/functional/centos/7/bluestore/group_vars/all | 4 ++-- tests/functional/centos/7/bluestore/hosts | 4 ++-- tests/functional/centos/7/bluestore/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/crypt-ded-jrn/group_vars/all | 4 ++-- tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/crypt-jrn-col/group_vars/all | 4 ++-- tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all | 4 ++-- .../centos/7/docker-crypt-jrn-col/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/docker-ded-jrn/group_vars/all | 4 ++-- .../functional/centos/7/docker-ded-jrn/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/docker/group_vars/all | 4 ++-- tests/functional/centos/7/docker/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/jrn-col-auto-dm/group_vars/all | 4 ++-- .../functional/centos/7/jrn-col-auto-dm/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/jrn-col-auto/group_vars/all | 4 ++-- tests/functional/centos/7/jrn-col-auto/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/jrn-col/group_vars/all | 4 ++-- tests/functional/centos/7/jrn-col/vagrant_variables.yml | 4 ++-- tests/functional/centos/7/lvm-osds/group_vars/all | 4 ++-- tests/functional/centos/7/lvm-osds/vagrant_variables.yml | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/tests/functional/centos/7/bluestore/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all index 2d2feab3e..518170988 100644 --- a/tests/functional/centos/7/bluestore/group_vars/all +++ b/tests/functional/centos/7/bluestore/group_vars/all @@ -5,8 +5,8 @@ ceph_repository: community cluster: test monitor_interface: eth1 radosgw_interface: eth1 -public_network: "192.168.1.0/24" -cluster_network: "192.168.2.0/24" +public_network: "192.168.35.0/24" +cluster_network: "192.168.36.0/24" journal_size: 100 osd_objectstore: "bluestore" devices: diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts index 50264e226..8f3cf3749 100644 --- a/tests/functional/centos/7/bluestore/hosts +++ b/tests/functional/centos/7/bluestore/hosts @@ -1,7 +1,7 @@ [mons] -mon0 monitor_address=192.168.1.10 +mon0 monitor_address=192.168.35.10 mon1 monitor_interface=eth1 -mon2 monitor_address=192.168.1.12 +mon2 monitor_address=192.168.35.12 [mgrs] mon0 diff --git a/tests/functional/centos/7/bluestore/vagrant_variables.yml b/tests/functional/centos/7/bluestore/vagrant_variables.yml index ded9c1540..d8a8e5655 100644 --- a/tests/functional/centos/7/bluestore/vagrant_variables.yml +++ b/tests/functional/centos/7/bluestore/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.1 -cluster_subnet: 192.168.2 +public_subnet: 192.168.35 +cluster_subnet: 192.168.36 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all index 99daba91a..6fe0e959c 100644 --- a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all @@ -2,8 +2,8 @@ ceph_origin: repository ceph_repository: community -public_network: "192.168.11.0/24" -cluster_network: "192.168.12.0/24" +public_network: "192.168.21.0/24" +cluster_network: "192.168.22.0/24" journal_size: 100 monitor_interface: eth1 radosgw_interface: eth1 diff --git a/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml index 8a8fb891d..554de97f1 100644 --- a/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml +++ b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.11 -cluster_subnet: 192.168.12 +public_subnet: 192.168.21 +cluster_subnet: 192.168.22 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/crypt-jrn-col/group_vars/all b/tests/functional/centos/7/crypt-jrn-col/group_vars/all index f7005f89e..36cd697b7 100644 --- a/tests/functional/centos/7/crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/crypt-jrn-col/group_vars/all @@ -2,8 +2,8 @@ ceph_origin: repository ceph_repository: community -public_network: "192.168.13.0/24" -cluster_network: "192.168.14.0/24" +public_network: "192.168.25.0/24" +cluster_network: "192.168.26.0/24" journal_size: 100 monitor_interface: eth1 radosgw_interface: eth1 diff --git a/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml index 33ff53f7a..7ed20ed22 100644 --- a/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml +++ b/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.13 -cluster_subnet: 192.168.14 +public_subnet: 192.168.25 +cluster_subnet: 192.168.26 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all index 05f41d63e..983f1c265 100644 --- a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all +++ b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all @@ -10,8 +10,8 @@ radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" journal_size: 100 ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" +public_network: "192.168.27.0/24" +cluster_network: "192.168.28.0/24" osd_scenario: collocated osd_objectstore: filestore dmcrypt: true diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml index aa03b197c..cb84f4552 100644 --- a/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml +++ b/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml @@ -18,8 +18,8 @@ mgr_vms: 0 restapi: true # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 +public_subnet: 192.168.27 +cluster_subnet: 192.168.28 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/docker-ded-jrn/group_vars/all b/tests/functional/centos/7/docker-ded-jrn/group_vars/all index be622361b..b719d082b 100644 --- a/tests/functional/centos/7/docker-ded-jrn/group_vars/all +++ b/tests/functional/centos/7/docker-ded-jrn/group_vars/all @@ -10,8 +10,8 @@ radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" journal_size: 100 ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" +public_network: "192.168.29.0/24" +cluster_network: "192.168.30.0/24" ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore osd_scenario: non-collocated diff --git a/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml index aa03b197c..4d66c1873 100644 --- a/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml +++ b/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml @@ -18,8 +18,8 @@ mgr_vms: 0 restapi: true # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 +public_subnet: 192.168.29 +cluster_subnet: 192.168.30 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all index d14454bb4..7603b20af 100644 --- a/tests/functional/centos/7/docker/group_vars/all +++ b/tests/functional/centos/7/docker/group_vars/all @@ -10,8 +10,8 @@ radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" journal_size: 100 ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" +public_network: "192.168.17.0/24" +cluster_network: "192.168.18.0/24" osd_scenario: collocated ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml index 5a49b01e4..34b4d8311 100644 --- a/tests/functional/centos/7/docker/vagrant_variables.yml +++ b/tests/functional/centos/7/docker/vagrant_variables.yml @@ -18,8 +18,8 @@ mgr_vms: 1 restapi: true # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 +public_subnet: 192.168.17 +cluster_subnet: 192.168.18 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/jrn-col-auto-dm/group_vars/all b/tests/functional/centos/7/jrn-col-auto-dm/group_vars/all index 4dd8506d6..9bc69f031 100644 --- a/tests/functional/centos/7/jrn-col-auto-dm/group_vars/all +++ b/tests/functional/centos/7/jrn-col-auto-dm/group_vars/all @@ -3,8 +3,8 @@ ceph_origin: repository ceph_repository: community cluster: test -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" +public_network: "192.168.37.0/24" +cluster_network: "192.168.38.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 diff --git a/tests/functional/centos/7/jrn-col-auto-dm/vagrant_variables.yml b/tests/functional/centos/7/jrn-col-auto-dm/vagrant_variables.yml index 0dcf9d6da..44ab48397 100644 --- a/tests/functional/centos/7/jrn-col-auto-dm/vagrant_variables.yml +++ b/tests/functional/centos/7/jrn-col-auto-dm/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.3 -cluster_subnet: 192.168.4 +public_subnet: 192.168.37 +cluster_subnet: 192.168.38 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/jrn-col-auto/group_vars/all b/tests/functional/centos/7/jrn-col-auto/group_vars/all index ef5e3e110..1b00a2250 100644 --- a/tests/functional/centos/7/jrn-col-auto/group_vars/all +++ b/tests/functional/centos/7/jrn-col-auto/group_vars/all @@ -3,8 +3,8 @@ ceph_origin: repository ceph_repository: community cluster: test -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" +public_network: "192.168.33.0/24" +cluster_network: "192.168.34.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 diff --git a/tests/functional/centos/7/jrn-col-auto/vagrant_variables.yml b/tests/functional/centos/7/jrn-col-auto/vagrant_variables.yml index 0dcf9d6da..4b2f98358 100644 --- a/tests/functional/centos/7/jrn-col-auto/vagrant_variables.yml +++ b/tests/functional/centos/7/jrn-col-auto/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.3 -cluster_subnet: 192.168.4 +public_subnet: 192.168.33 +cluster_subnet: 192.168.34 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/jrn-col/group_vars/all b/tests/functional/centos/7/jrn-col/group_vars/all index 2f64e3f78..17340d4ed 100644 --- a/tests/functional/centos/7/jrn-col/group_vars/all +++ b/tests/functional/centos/7/jrn-col/group_vars/all @@ -3,8 +3,8 @@ ceph_origin: repository ceph_repository: community cluster: test -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" +public_network: "192.168.31.0/24" +cluster_network: "192.168.32.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 diff --git a/tests/functional/centos/7/jrn-col/vagrant_variables.yml b/tests/functional/centos/7/jrn-col/vagrant_variables.yml index cbb343842..09ee1fc34 100644 --- a/tests/functional/centos/7/jrn-col/vagrant_variables.yml +++ b/tests/functional/centos/7/jrn-col/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.3 -cluster_subnet: 192.168.4 +public_subnet: 192.168.31 +cluster_subnet: 192.168.32 # MEMORY # set 1024 for CentOS diff --git a/tests/functional/centos/7/lvm-osds/group_vars/all b/tests/functional/centos/7/lvm-osds/group_vars/all index f8ec2f5a0..a449d6d19 100644 --- a/tests/functional/centos/7/lvm-osds/group_vars/all +++ b/tests/functional/centos/7/lvm-osds/group_vars/all @@ -3,8 +3,8 @@ ceph_origin: repository ceph_repository: community cluster: ceph -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" +public_network: "192.168.39.0/24" +cluster_network: "192.168.40.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 diff --git a/tests/functional/centos/7/lvm-osds/vagrant_variables.yml b/tests/functional/centos/7/lvm-osds/vagrant_variables.yml index cbb343842..7ed9176e4 100644 --- a/tests/functional/centos/7/lvm-osds/vagrant_variables.yml +++ b/tests/functional/centos/7/lvm-osds/vagrant_variables.yml @@ -22,8 +22,8 @@ restapi: true ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.3 -cluster_subnet: 192.168.4 +public_subnet: 192.168.39 +cluster_subnet: 192.168.40 # MEMORY # set 1024 for CentOS -- 2.39.5