From 7d705395fbca15ff93cccc195c4cea537448dbaa Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 19 Dec 2018 10:17:49 +0100 Subject: [PATCH] tests: play lvm_setup.yml on all scenarios We should play lvm_setup.yml on all scenario except `lvm_batch`. Signed-off-by: Guillaume Abrioux --- .../add-osds/container/group_vars/all | 8 +- tests/functional/add-osds/group_vars/all | 8 +- tests/functional/centos/7/cluster/Vagrantfile | 1 - .../centos/7/cluster/ceph-override.json | 21 ------ .../centos/7/cluster/container/Vagrantfile | 1 - .../7/cluster/container/ceph-override.json | 1 - .../centos/7/cluster/container/group_vars/all | 40 ---------- .../7/cluster/container/group_vars/clients | 22 ------ .../7/cluster/container/group_vars/iscsigws | 3 - .../7/cluster/container/group_vars/mons | 10 --- .../7/cluster/container/group_vars/osds | 11 --- .../7/cluster/container/group_vars/rgws | 7 -- .../centos/7/cluster/container/hosts | 27 ------- .../7/cluster/container/vagrant_variables.yml | 60 --------------- .../centos/7/cluster/group_vars/all | 36 --------- .../centos/7/cluster/group_vars/clients | 24 ------ .../centos/7/cluster/group_vars/iscsigws | 3 - .../centos/7/cluster/group_vars/mons | 10 --- .../centos/7/cluster/group_vars/nfss | 7 -- .../centos/7/cluster/group_vars/osds | 12 --- .../centos/7/cluster/group_vars/rgws | 8 -- tests/functional/centos/7/cluster/hosts | 27 ------- .../7/cluster/hosts-switch-to-containers | 19 ----- .../centos/7/cluster/vagrant_variables.yml | 73 ------------------- .../rgw-multisite/container/group_vars/all | 8 +- .../container/secondary/group_vars/all | 8 +- tests/functional/rgw-multisite/group_vars/all | 8 +- .../rgw-multisite/secondary/group_vars/all | 8 +- tox.ini | 1 + 29 files changed, 37 insertions(+), 435 deletions(-) delete mode 120000 tests/functional/centos/7/cluster/Vagrantfile delete mode 100644 tests/functional/centos/7/cluster/ceph-override.json delete mode 120000 tests/functional/centos/7/cluster/container/Vagrantfile delete mode 120000 tests/functional/centos/7/cluster/container/ceph-override.json delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/all delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/clients delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/iscsigws delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/mons delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/osds delete mode 100644 tests/functional/centos/7/cluster/container/group_vars/rgws delete mode 100644 tests/functional/centos/7/cluster/container/hosts delete mode 100644 tests/functional/centos/7/cluster/container/vagrant_variables.yml delete mode 100644 tests/functional/centos/7/cluster/group_vars/all delete mode 100644 tests/functional/centos/7/cluster/group_vars/clients delete mode 100644 tests/functional/centos/7/cluster/group_vars/iscsigws delete mode 100644 tests/functional/centos/7/cluster/group_vars/mons delete mode 100644 tests/functional/centos/7/cluster/group_vars/nfss delete mode 100644 tests/functional/centos/7/cluster/group_vars/osds delete mode 100644 tests/functional/centos/7/cluster/group_vars/rgws delete mode 100644 tests/functional/centos/7/cluster/hosts delete mode 100644 tests/functional/centos/7/cluster/hosts-switch-to-containers delete mode 100644 tests/functional/centos/7/cluster/vagrant_variables.yml diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 9b1a6c3a5..a33b9293f 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -14,8 +14,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all index 6896bd97e..0ac99d0ca 100644 --- a/tests/functional/add-osds/group_vars/all +++ b/tests/functional/add-osds/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/cluster/Vagrantfile b/tests/functional/centos/7/cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/ceph-override.json b/tests/functional/centos/7/cluster/ceph-override.json deleted file mode 100644 index cce7e62e8..000000000 --- a/tests/functional/centos/7/cluster/ceph-override.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "cephfs_pools": [ - { - "name": "cephfs_metadata", - "pgs": 8, - "size": 1 - }, - { - "name": "cephfs_data", - "pgs": 8, - "size": 1 - } - ], - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/centos/7/cluster/container/Vagrantfile b/tests/functional/centos/7/cluster/container/Vagrantfile deleted file mode 120000 index 9797e1cb7..000000000 --- a/tests/functional/centos/7/cluster/container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/container/ceph-override.json b/tests/functional/centos/7/cluster/container/ceph-override.json deleted file mode 120000 index 24aaedd5e..000000000 --- a/tests/functional/centos/7/cluster/container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/container/group_vars/all b/tests/functional/centos/7/cluster/container/group_vars/all deleted file mode 100644 index c9d554b09..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/all +++ /dev/null @@ -1,40 +0,0 @@ ---- -# this is only here to let the CI tests know -# that this scenario is using docker -docker: True - -containerized_deployment: True -monitor_interface: eth1 -radosgw_interface: eth1 -radosgw_num_instances: 2 -ceph_mon_docker_subnet: "{{ public_network }}" -ceph_docker_on_openstack: False -public_network: "192.168.17.0/24" -cluster_network: "192.168.18.0/24" -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 -ceph_conf_overrides: - global: - osd_pool_default_size: 1 -openstack_config: True -openstack_glance_pool: - name: "images" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: 1 -openstack_cinder_pool: - name: "volumes" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: 1 -openstack_pools: - - "{{ openstack_glance_pool }}" - - "{{ openstack_cinder_pool }}" diff --git a/tests/functional/centos/7/cluster/container/group_vars/clients b/tests/functional/centos/7/cluster/container/group_vars/clients deleted file mode 100644 index a8ea366d0..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/clients +++ /dev/null @@ -1,22 +0,0 @@ ---- -user_config: True -copy_admin_key: True -test: - name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" -test2: - name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" -pools: - - "{{ test }}" - - "{{ test2 }}" diff --git a/tests/functional/centos/7/cluster/container/group_vars/iscsigws b/tests/functional/centos/7/cluster/container/group_vars/iscsigws deleted file mode 100644 index 401805eb3..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/iscsigws +++ /dev/null @@ -1,3 +0,0 @@ ---- -gateway_ip_list: 192.168.1.90 -generate_crt: True \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/container/group_vars/mons b/tests/functional/centos/7/cluster/container/group_vars/mons deleted file mode 100644 index 4b5405947..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/mons +++ /dev/null @@ -1,10 +0,0 @@ ---- -create_crush_tree: True -crush_rule_config: True -crush_rule_hdd: - name: HDD - root: HDD - type: host - default: true -crush_rules: - - "{{ crush_rule_hdd }}" diff --git a/tests/functional/centos/7/cluster/container/group_vars/osds b/tests/functional/centos/7/cluster/container/group_vars/osds deleted file mode 100644 index 672a0f956..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/osds +++ /dev/null @@ -1,11 +0,0 @@ ---- -ceph_osd_docker_run_script_path: /var/tmp -osd_objectstore: "bluestore" -osd_scenario: lvm -lvm_volumes: - - data: data-lv1 - data_vg: test_group - - data: data-lv2 - data_vg: test_group - db: journal1 - db_vg: journals \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/container/group_vars/rgws b/tests/functional/centos/7/cluster/container/group_vars/rgws deleted file mode 100644 index 8f2a9a368..000000000 --- a/tests/functional/centos/7/cluster/container/group_vars/rgws +++ /dev/null @@ -1,7 +0,0 @@ ---- -copy_admin_key: True -rgw_create_pools: - foo: - pg_num: 17 - bar: - pg_num: 19 diff --git a/tests/functional/centos/7/cluster/container/hosts b/tests/functional/centos/7/cluster/container/hosts deleted file mode 100644 index 042567913..000000000 --- a/tests/functional/centos/7/cluster/container/hosts +++ /dev/null @@ -1,27 +0,0 @@ -[mons] -mon0 -mon1 -mon2 - -[osds] -osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" -osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" - -[mdss] -mds0 - -[rgws] -rgw0 - -#[nfss] -#nfs0 - -[clients] -client0 -client1 - -[rbdmirrors] -rbd-mirror0 - -[iscsigws] -iscsi-gw0 diff --git a/tests/functional/centos/7/cluster/container/vagrant_variables.yml b/tests/functional/centos/7/cluster/container/vagrant_variables.yml deleted file mode 100644 index 78166da85..000000000 --- a/tests/functional/centos/7/cluster/container/vagrant_variables.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: True - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 2 -mds_vms: 1 -rgw_vms: 1 -nfs_vms: 0 -rbd_mirror_vms: 1 -client_vms: 2 -iscsi_gw_vms: 1 -mgr_vms: 0 - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.17 -cluster_subnet: 192.168.18 - -# MEMORY -# set 1024 for CentOS -memory: 1024 - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sda', '/dev/sdb' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/atomic-host -#client_vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -vagrant_sync_dir: /vagrant -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all deleted file mode 100644 index b9fc199e6..000000000 --- a/tests/functional/centos/7/cluster/group_vars/all +++ /dev/null @@ -1,36 +0,0 @@ ---- -ceph_origin: repository -ceph_repository: community -public_network: "192.168.1.0/24" -cluster_network: "192.168.2.0/24" -radosgw_interface: eth1 -radosgw_num_instances: 2 -ceph_conf_overrides: - global: - osd_pool_default_size: 1 -openstack_config: True -openstack_glance_pool: - name: "images" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: 1 -openstack_cinder_pool: - name: "volumes" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: 1 -openstack_pools: - - "{{ openstack_glance_pool }}" - - "{{ openstack_cinder_pool }}" -nfs_ganesha_stable: true -nfs_ganesha_dev: false -nfs_ganesha_stable_branch: V2.5-stable -nfs_ganesha_flavor: "ceph_master" \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/group_vars/clients b/tests/functional/centos/7/cluster/group_vars/clients deleted file mode 100644 index b892f8024..000000000 --- a/tests/functional/centos/7/cluster/group_vars/clients +++ /dev/null @@ -1,24 +0,0 @@ ---- -copy_admin_key: True -user_config: True -test: - name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" -test2: - name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" -pools: - - "{{ test }}" - - "{{ test2 }}" diff --git a/tests/functional/centos/7/cluster/group_vars/iscsigws b/tests/functional/centos/7/cluster/group_vars/iscsigws deleted file mode 100644 index f5b41fc3f..000000000 --- a/tests/functional/centos/7/cluster/group_vars/iscsigws +++ /dev/null @@ -1,3 +0,0 @@ ---- -gateway_ip_list: 192.168.1.90 -generate_crt: True diff --git a/tests/functional/centos/7/cluster/group_vars/mons b/tests/functional/centos/7/cluster/group_vars/mons deleted file mode 100644 index 4b8817342..000000000 --- a/tests/functional/centos/7/cluster/group_vars/mons +++ /dev/null @@ -1,10 +0,0 @@ ---- -create_crush_tree: True -crush_rule_config: True -crush_rule_hdd: - name: HDD - root: HDD - type: host - default: true -crush_rules: - - "{{ crush_rule_hdd }}" \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/group_vars/nfss b/tests/functional/centos/7/cluster/group_vars/nfss deleted file mode 100644 index 2d2f83bb6..000000000 --- a/tests/functional/centos/7/cluster/group_vars/nfss +++ /dev/null @@ -1,7 +0,0 @@ -copy_admin_key: true -nfs_file_gw: false -nfs_obj_gw: true -ganesha_conf_overrides: | - CACHEINODE { - Entries_HWMark = 100000; - } diff --git a/tests/functional/centos/7/cluster/group_vars/osds b/tests/functional/centos/7/cluster/group_vars/osds deleted file mode 100644 index e27c47422..000000000 --- a/tests/functional/centos/7/cluster/group_vars/osds +++ /dev/null @@ -1,12 +0,0 @@ ---- -os_tuning_params: - - { name: fs.file-max, value: 26234859 } -osd_scenario: lvm -osd_objectstore: "bluestore" -lvm_volumes: - - data: data-lv1 - data_vg: test_group - - data: data-lv2 - data_vg: test_group - db: journal1 - db_vg: journals \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/group_vars/rgws b/tests/functional/centos/7/cluster/group_vars/rgws deleted file mode 100644 index a88254314..000000000 --- a/tests/functional/centos/7/cluster/group_vars/rgws +++ /dev/null @@ -1,8 +0,0 @@ -copy_admin_key: true -rgw_create_pools: - foo: - pg_num: 17 - bar: - pg_num: 19 -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts deleted file mode 100644 index e22cf7420..000000000 --- a/tests/functional/centos/7/cluster/hosts +++ /dev/null @@ -1,27 +0,0 @@ -[mons] -ceph-mon0 monitor_address=192.168.1.10 -ceph-mon1 monitor_interface=eth1 -ceph-mon2 monitor_address=192.168.1.12 - -[osds] -ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }" -ceph-osd1 osd_crush_location="{ 'root': 'default', 'host': 'ceph-osd1' }" - -[mdss] -ceph-mds0 - -[rgws] -ceph-rgw0 - -[clients] -ceph-client0 -ceph-client1 - -#[nfss] -#ceph-nfs0 - -[rbdmirrors] -ceph-rbd-mirror0 - -[iscsigws] -ceph-iscsi-gw0 ceph_repository="dev" diff --git a/tests/functional/centos/7/cluster/hosts-switch-to-containers b/tests/functional/centos/7/cluster/hosts-switch-to-containers deleted file mode 100644 index f1aee948c..000000000 --- a/tests/functional/centos/7/cluster/hosts-switch-to-containers +++ /dev/null @@ -1,19 +0,0 @@ -[all:vars] -docker=True - -[mons] -ceph-mon0 monitor_address=192.168.1.10 -ceph-mon1 monitor_interface=eth1 -ceph-mon2 monitor_address=192.168.1.12 - -[osds] -ceph-osd0 - -[mdss] -ceph-mds0 - -[rgws] -ceph-rgw0 - -[clients] -ceph-client0 diff --git a/tests/functional/centos/7/cluster/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml deleted file mode 100644 index d73d4cfb8..000000000 --- a/tests/functional/centos/7/cluster/vagrant_variables.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 2 -mds_vms: 1 -rgw_vms: 1 -nfs_vms: 0 -rbd_mirror_vms: 1 -client_vms: 2 -iscsi_gw_vms: 1 -mgr_vms: 0 - -# INSTALL SOURCE OF CEPH -# valid values are 'stable' and 'dev' -ceph_install_source: stable - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.1 -cluster_subnet: 192.168.2 - -# MEMORY -# set 1024 for CentOS -memory: 1024 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -vagrant_sync_dir: /vagrant -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: fs.file-max, value: 26234859 } - -# VM prefix name, need to match the hostname -label_prefix: ceph diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all index f5dedffd6..1949c2164 100644 --- a/tests/functional/rgw-multisite/container/group_vars/all +++ b/tests/functional/rgw-multisite/container/group_vars/all @@ -14,8 +14,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all index e8a2fa5d6..bb51d7930 100644 --- a/tests/functional/rgw-multisite/container/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all @@ -14,8 +14,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all index 607799897..3a9a13eb5 100644 --- a/tests/functional/rgw-multisite/group_vars/all +++ b/tests/functional/rgw-multisite/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all index 08fca3c9d..2b605f43e 100644 --- a/tests/functional/rgw-multisite/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/secondary/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tox.ini b/tox.ini index 29459f8b8..50e074a7f 100644 --- a/tox.ini +++ b/tox.ini @@ -153,6 +153,7 @@ commands= [add-osds] commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/setup.yml + ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/lvm_setup.yml cp {toxinidir}/infrastructure-playbooks/add-osd.yml {toxinidir}/add-osd.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/add-osd.yml --extra-vars "\ ireallymeanit=yes \ -- 2.39.5