From ce7503a3a647975d11ca421ef4ff9eec167d276c Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 27 Jan 2020 15:49:30 +0100 Subject: [PATCH] tests: add 'all_in_one' scenario Add new scenario 'all_in_one' in order to catch more collocated related issues. Signed-off-by: Guillaume Abrioux (cherry picked from commit 3e7dbb4b16dc7de3b46c18db4c00e7f2c2a50453) --- tests/functional/all-in-one/Vagrantfile | 1 + .../functional/all-in-one/ceph-override.json | 1 + .../all-in-one/container/Vagrantfile | 1 + .../all-in-one/container/ceph-override.json | 1 + .../all-in-one/container/group_vars/all | 39 ++++++++++++ tests/functional/all-in-one/container/hosts | 20 ++++++ .../container/vagrant_variables.yml | 61 +++++++++++++++++++ tests/functional/all-in-one/group_vars/all | 36 +++++++++++ tests/functional/all-in-one/hosts | 20 ++++++ tests/functional/all-in-one/hosts-ubuntu | 1 + .../all-in-one/vagrant_variables.yml | 57 +++++++++++++++++ tox.ini | 5 +- 12 files changed, 241 insertions(+), 2 deletions(-) create mode 120000 tests/functional/all-in-one/Vagrantfile create mode 120000 tests/functional/all-in-one/ceph-override.json create mode 120000 tests/functional/all-in-one/container/Vagrantfile create mode 120000 tests/functional/all-in-one/container/ceph-override.json create mode 100644 tests/functional/all-in-one/container/group_vars/all create mode 100644 tests/functional/all-in-one/container/hosts create mode 100644 tests/functional/all-in-one/container/vagrant_variables.yml create mode 100644 tests/functional/all-in-one/group_vars/all create mode 100644 tests/functional/all-in-one/hosts create mode 120000 tests/functional/all-in-one/hosts-ubuntu create mode 100644 tests/functional/all-in-one/vagrant_variables.yml diff --git a/tests/functional/all-in-one/Vagrantfile b/tests/functional/all-in-one/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/all-in-one/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/all-in-one/ceph-override.json b/tests/functional/all-in-one/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/all-in-one/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/all-in-one/container/Vagrantfile b/tests/functional/all-in-one/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/all-in-one/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/all-in-one/container/ceph-override.json b/tests/functional/all-in-one/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/all-in-one/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all new file mode 100644 index 000000000..f7934ad0b --- /dev/null +++ b/tests/functional/all-in-one/container/group_vars/all @@ -0,0 +1,39 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +containerized_deployment: True +monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +radosgw_num_instances: 2 +ceph_mon_docker_subnet: "{{ public_network }}" +ceph_docker_on_openstack: False +public_network: "192.168.19.0/24" +cluster_network: "192.168.20.0/24" +rgw_override_bucket_index_max_shards: 16 +rgw_bucket_default_quota_max_objects: 1638400 +openstack_config: True +dashboard_enabled: false +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + mon_warn_on_pool_no_redundancy: false + osd_pool_default_size: 1 +handler_health_mon_check_delay: 10 +handler_health_osd_check_delay: 10 +rgw_create_pools: + foo: + pg_num: 16 + bar: + pg_num: 16 +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/all-in-one/container/hosts b/tests/functional/all-in-one/container/hosts new file mode 100644 index 000000000..26b9e2f39 --- /dev/null +++ b/tests/functional/all-in-one/container/hosts @@ -0,0 +1,20 @@ +[mons] +osd0 +osd1 +osd2 + +[mgrs] +osd0 +osd1 +osd2 + +[osds] +osd0 +osd1 +osd2 + +[mdss] +osd0 + +[rgws] +osd0 diff --git a/tests/functional/all-in-one/container/vagrant_variables.yml b/tests/functional/all-in-one/container/vagrant_variables.yml new file mode 100644 index 000000000..9a09499a2 --- /dev/null +++ b/tests/functional/all-in-one/container/vagrant_variables.yml @@ -0,0 +1,61 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: True + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 0 +osd_vms: 3 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +grafana_server_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.19 +cluster_subnet: 192.168.20 + +# 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: / +# 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/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all new file mode 100644 index 000000000..17c59c6c9 --- /dev/null +++ b/tests/functional/all-in-one/group_vars/all @@ -0,0 +1,36 @@ +--- +containerized_deployment: False +ceph_origin: repository +ceph_repository: community +monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +ceph_mon_docker_subnet: "{{ public_network }}" +ceph_docker_on_openstack: False +openstack_config: True +dashboard_enabled: 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_pg_num: 8 + mon_warn_on_pool_no_redundancy: false + osd_pool_default_size: 1 +handler_health_mon_check_delay: 10 +handler_health_osd_check_delay: 10 +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 +rgw_create_pools: + foo: + pg_num: 16 + bar: + pg_num: 16 \ No newline at end of file diff --git a/tests/functional/all-in-one/hosts b/tests/functional/all-in-one/hosts new file mode 100644 index 000000000..26b9e2f39 --- /dev/null +++ b/tests/functional/all-in-one/hosts @@ -0,0 +1,20 @@ +[mons] +osd0 +osd1 +osd2 + +[mgrs] +osd0 +osd1 +osd2 + +[osds] +osd0 +osd1 +osd2 + +[mdss] +osd0 + +[rgws] +osd0 diff --git a/tests/functional/all-in-one/hosts-ubuntu b/tests/functional/all-in-one/hosts-ubuntu new file mode 120000 index 000000000..9b0b900ab --- /dev/null +++ b/tests/functional/all-in-one/hosts-ubuntu @@ -0,0 +1 @@ +hosts \ No newline at end of file diff --git a/tests/functional/all-in-one/vagrant_variables.yml b/tests/functional/all-in-one/vagrant_variables.yml new file mode 100644 index 000000000..2387399e6 --- /dev/null +++ b/tests/functional/all-in-one/vagrant_variables.yml @@ -0,0 +1,57 @@ +--- +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 0 +osd_vms: 3 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +grafana_server_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.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/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 diff --git a/tox.ini b/tox.ini index 18a26ee75..8ed67e887 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_osd_legacy,lvm_batch,add_osds,rgw_multisite,purge,lvm_auto_discovery} +envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_osd_legacy,lvm_batch,add_osds,rgw_multisite,purge,lvm_auto_discovery,all_in_one} {centos,ubuntu}-non_container-switch_to_containers {centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create} infra_lv_create @@ -239,6 +239,7 @@ changedir= ooo_collocation: {toxinidir}/tests/functional/ooo-collocation add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:} + all_in_one: {toxinidir}/tests/functional/all-in-one{env:CONTAINER_DIR:} commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup" @@ -276,7 +277,7 @@ commands= all_daemons: py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # handlers/idempotency test - all_daemons: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-luminous} copy_admin_key={env:COPY_ADMIN_KEY:False} " --extra-vars @ceph-override.json + all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-luminous} copy_admin_key={env:COPY_ADMIN_KEY:False} " --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands} -- 2.39.5