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 <gabrioux@redhat.com>

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 9b1a6c3a5d2b50ec60631dcc8c6647fa2bac8660..a33b9293f5a2624cd98a1a80a7133c6b651c281f 100644 (file)
--- 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 6896bd97ed414b700af87d29ba4a6e6c9f7dab49..0ac99d0ca87e505bb1ef0ef804a6ac524136c385 100644 (file)
--- 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 (symlink)
index dfd7436..0000000
--- 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 (file)
index cce7e62..0000000
--- 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 (symlink)
index 9797e1c..0000000
--- 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 (symlink)
index 24aaedd..0000000
--- 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 (file)
index c9d554b..0000000
--- 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 (file)
index a8ea366..0000000
--- 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 (file)
index 401805e..0000000
--- 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 (file)
index 4b54059..0000000
--- 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 (file)
index 672a0f9..0000000
--- 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 (file)
index 8f2a9a3..0000000
--- 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 (file)
index 0425679..0000000
--- 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 (file)
index 78166da..0000000
--- 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 (file)
index b9fc199..0000000
--- 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 (file)
index b892f80..0000000
--- 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 (file)
index f5b41fc..0000000
--- 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 (file)
index 4b88173..0000000
--- 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 (file)
index 2d2f83b..0000000
--- 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 (file)
index e27c474..0000000
--- 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 (file)
index a882543..0000000
--- 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 (file)
index e22cf74..0000000
--- 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 (file)
index f1aee94..0000000
--- 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 (file)
index d73d4cf..0000000
--- 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 f5dedffd6a7b989f5aaa4cb22b61274f791c1abf..1949c21643c9621cc6f1d77ed2b474e067ba20ef 100644 (file)
--- 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 e8a2fa5d62ae07ff5419abd8b979f73463f3c92c..bb51d7930f76a81e9e35dc369e6b9ffbc39f5f57 100644 (file)
--- 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 60779989792cc1e5277a5e60c3e232f9f3732d2f..3a9a13eb5b7be90fa03841f571c0e9c00a2c0e80 100644 (file)
--- 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 08fca3c9d541fada2cf7c680a798a3e1a01f8bec..2b605f43eca482d120263676648be3197dc53bce 100644 (file)
--- 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 29459f8b8a1cf02333f384f17a8f03dc4d272e94..50e074a7f705d376b7df89866210acfadcb35174 100644 (file)
--- 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 \