tests: refact testing in stable-3.2

Apply the same refact recently introduced in master to stable-3.2

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3553/head
Guillaume Abrioux 2019-01-22 14:25:45 +01:00 committed by Sébastien Han
parent af17e0dfbb
commit 299baed635
181 changed files with 641 additions and 356 deletions

4
Vagrantfile vendored
View File

@ -20,8 +20,8 @@ NISCSI_GWS = settings['iscsi_gw_vms']
MGRS = settings['mgr_vms'] MGRS = settings['mgr_vms']
PUBLIC_SUBNET = settings['public_subnet'] PUBLIC_SUBNET = settings['public_subnet']
CLUSTER_SUBNET = settings['cluster_subnet'] CLUSTER_SUBNET = settings['cluster_subnet']
BOX = settings['vagrant_box'] BOX = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['vagrant_box']
CLIENT_BOX = settings['client_vagrant_box'] || settings['vagrant_box'] CLIENT_BOX = settings['client_vagrant_box'] || BOX
BOX_URL = settings['vagrant_box_url'] BOX_URL = settings['vagrant_box_url']
SYNC_DIR = settings['vagrant_sync_dir'] SYNC_DIR = settings['vagrant_sync_dir']
MEMORY = settings['memory'] MEMORY = settings['memory']

View File

@ -0,0 +1 @@
../../../Vagrantfile

View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

View File

@ -0,0 +1 @@
../../../../Vagrantfile

View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

View File

@ -14,10 +14,15 @@ osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:
- data: /dev/sda - data: data-lv1
- data: /dev/sdb data_vg: test_group
- data: data-lv2
data_vg: test_group
db: journal1
db_vg: journals
os_tuning_params: os_tuning_params:
- { name: fs.file-max, value: 26234859 } - { name: fs.file-max, value: 26234859 }
ceph_conf_overrides: ceph_conf_overrides:
global: global:
osd_pool_default_size: 1 osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp

View File

@ -12,8 +12,12 @@ osd_scenario: lvm
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
lvm_volumes: lvm_volumes:
- data: /dev/sda - data: data-lv1
- data: /dev/sdb data_vg: test_group
- data: data-lv2
data_vg: test_group
db: journal1
db_vg: journals
os_tuning_params: os_tuning_params:
- { name: fs.file-max, value: 26234859 } - { name: fs.file-max, value: 26234859 }
ceph_conf_overrides: ceph_conf_overrides:

View File

@ -0,0 +1 @@
../../../Vagrantfile

View File

@ -0,0 +1 @@
../../../../Vagrantfile

View File

@ -0,0 +1,21 @@
{
"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"
}

View File

@ -4,7 +4,7 @@ mon1
mon2 mon2
[mgrs] [mgrs]
mgr0 mon0
[osds] [osds]
osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"

View File

@ -9,9 +9,9 @@ osd_vms: 2
mds_vms: 1 mds_vms: 1
rgw_vms: 1 rgw_vms: 1
nfs_vms: 0 nfs_vms: 0
rbd_mirror_vms: 1 rbd_mirror_vms: 0
client_vms: 2 client_vms: 2
iscsi_gw_vms: 1 iscsi_gw_vms: 0
mgr_vms: 1 mgr_vms: 1
# Deploy RESTAPI on each of the Monitors # Deploy RESTAPI on each of the Monitors

View File

@ -7,10 +7,6 @@ radosgw_interface: eth1
ceph_conf_overrides: ceph_conf_overrides:
global: global:
osd_pool_default_size: 1 osd_pool_default_size: 1
nfs_ganesha_stable: true
nfs_ganesha_dev: false
nfs_ganesha_stable_branch: V2.5-stable
nfs_ganesha_flavor: "ceph_master"
openstack_config: True openstack_config: True
openstack_glance_pool: openstack_glance_pool:
name: "images" name: "images"

View File

@ -0,0 +1,36 @@
[mons]
mon0 monitor_address=192.168.1.10
mon1 monitor_interface=eth1
mon2 monitor_address=192.168.1.12
[mgrs]
mon0
[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
[clients]
client0
client1
#[nfss]
#nfs0
[rbdmirrors]
rbd-mirror0
[iscsigws]
iscsi-gw0 ceph_repository="dev"
[all:vars]
nfs_ganesha_stable=True
nfs_ganesha_dev=False
nfs_ganesha_stable_branch="V2.5-stable"
nfs_ganesha_flavor="ceph_master"

View File

@ -0,0 +1,22 @@
[all:vars]
docker=True
[mons]
mon0 monitor_address=192.168.1.10
mon1 monitor_interface=eth1
mon2 monitor_address=192.168.1.12
[mgrs]
mon0
[osds]
osd0
[mdss]
mds0
[rgws]
rgw0
[clients]
client0

View File

@ -0,0 +1,38 @@
[mons]
mon0 monitor_address=192.168.1.10
mon1 monitor_interface=eth1
mon2 monitor_address=192.168.1.12
[mgrs]
mon0
[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
[clients]
client0
client1
#[nfss]
#nfs0
[rbdmirrors]
rbd-mirror0
[iscsigws]
iscsi-gw0 ceph_repository="dev"
[all:vars]
debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']
nfs_ganesha_stable=True
nfs_ganesha_stable_branch="V2.5-stable"
nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
nfs_ganesha_dev=False
nfs_ganesha_flavor="ceph_master"

View File

@ -12,10 +12,7 @@ nfs_vms: 0
rbd_mirror_vms: 1 rbd_mirror_vms: 1
client_vms: 2 client_vms: 2
iscsi_gw_vms: 1 iscsi_gw_vms: 1
mgr_vms: 1 mgr_vms: 0
# Deploy RESTAPI on each of the Monitors
restapi: true
# INSTALL SOURCE OF CEPH # INSTALL SOURCE OF CEPH
# valid values are 'stable' and 'dev' # valid values are 'stable' and 'dev'
@ -73,4 +70,4 @@ os_tuning_params:
- { name: fs.file-max, value: 26234859 } - { name: fs.file-max, value: 26234859 }
# VM prefix name, need to match the hostname # VM prefix name, need to match the hostname
label_prefix: ceph # label_prefix: ceph

View File

@ -0,0 +1 @@
../../../Vagrantfile

View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

View File

@ -0,0 +1 @@
../../../../Vagrantfile

View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1,30 +0,0 @@
[mons]
ceph-mon0 monitor_address=192.168.1.10
ceph-mon1 monitor_interface=eth1
ceph-mon2 monitor_address=192.168.1.12
[mgrs]
ceph-mgr0
[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"

View File

@ -1,22 +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
[mgrs]
ceph-mgr0

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1 +0,0 @@
../../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1,10 +0,0 @@
[mons]
ceph-mon0 monitor_address=192.168.71.10
[mgrs]
ceph-mon0
[osds]
ceph-osd0
ceph-osd1
ceph-osd2

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -0,0 +1 @@
../../../Vagrantfile

View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

View File

@ -0,0 +1 @@
../../../../Vagrantfile

View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

View File

@ -0,0 +1,14 @@
---
containerized_deployment: False
monitor_interface: eth1
radosgw_interface: eth1
ceph_mon_docker_subnet: "{{ public_network }}"
ceph_docker_on_openstack: False
public_network: "192.168.15.0/24"
cluster_network: "192.168.16.0/24"
rgw_override_bucket_index_max_shards: 16
rgw_bucket_default_quota_max_objects: 1638400
ceph_conf_overrides:
global:
osd_pool_default_pg_num: 8
osd_pool_default_size: 1

View File

@ -0,0 +1,21 @@
---
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: ""
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 }}"

View File

@ -0,0 +1,11 @@
---
ceph_osd_docker_run_script_path: /var/tmp
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

View File

@ -0,0 +1,6 @@
---
rgw_create_pools:
foo:
pg_num: 17
bar:
pg_num: 19

View File

@ -0,0 +1,23 @@
[mons]
mon0
mon1
mon2
[osds]
osd0
[mdss]
mds0
rgw0
[rgws]
rgw0
mds0
[rbdmirrors]
rgw0
mds0
#[nfss]
#rgw0
#mds0

View File

@ -0,0 +1,56 @@
---
# DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 3
osd_vms: 1
mds_vms: 1
rgw_vms: 1
nfs_vms: 0
rbd_mirror_vms: 0
client_vms: 0
iscsi_gw_vms: 0
mgr_vms: 0
# SUBNETS TO USE FOR THE VMS
public_subnet: 192.168.15
cluster_subnet: 192.168.16
# 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/7
# 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: /
# 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

View File

@ -0,0 +1 @@
../../../Vagrantfile

View File

@ -0,0 +1 @@
../../../Vagrantfile

Some files were not shown because too many files have changed in this diff Show More