From deb5f2a1bd037741738dc19d814fe54e9fb96ced Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 16 May 2019 11:19:11 +0200 Subject: [PATCH] tests: add dashboard scenario testing This commit add a new scenario to test the dashboard deployment via ceph-ansible. Signed-off-by: Guillaume Abrioux (cherry picked from commit 17634fc3df5adf3b5eca70c42eeb5dd5c235aaae) --- tests/functional/dashboard/Vagrantfile | 1 + tests/functional/dashboard/ceph-override.json | 26 +++++++ .../dashboard/container/Vagrantfile | 1 + .../dashboard/container/ceph-override.json | 1 + .../dashboard/container/group_vars/all | 19 +++++ .../dashboard/container/group_vars/mons | 10 +++ .../dashboard/container/group_vars/osds | 10 +++ tests/functional/dashboard/container/hosts | 12 +++ .../dashboard/container/hosts-ubuntu | 15 ++++ .../dashboard/container/vagrant_variables.yml | 60 +++++++++++++++ tests/functional/dashboard/group_vars/all | 11 +++ tests/functional/dashboard/group_vars/mons | 10 +++ tests/functional/dashboard/group_vars/osds | 11 +++ tests/functional/dashboard/hosts | 12 +++ tests/functional/dashboard/hosts-ubuntu | 15 ++++ .../dashboard/vagrant_variables.yml | 73 +++++++++++++++++++ tox-dashboard.ini | 69 ++++++++++++++++++ 17 files changed, 356 insertions(+) create mode 120000 tests/functional/dashboard/Vagrantfile create mode 100644 tests/functional/dashboard/ceph-override.json create mode 120000 tests/functional/dashboard/container/Vagrantfile create mode 120000 tests/functional/dashboard/container/ceph-override.json create mode 100644 tests/functional/dashboard/container/group_vars/all create mode 100644 tests/functional/dashboard/container/group_vars/mons create mode 100644 tests/functional/dashboard/container/group_vars/osds create mode 100644 tests/functional/dashboard/container/hosts create mode 100644 tests/functional/dashboard/container/hosts-ubuntu create mode 100644 tests/functional/dashboard/container/vagrant_variables.yml create mode 100644 tests/functional/dashboard/group_vars/all create mode 100644 tests/functional/dashboard/group_vars/mons create mode 100644 tests/functional/dashboard/group_vars/osds create mode 100644 tests/functional/dashboard/hosts create mode 100644 tests/functional/dashboard/hosts-ubuntu create mode 100644 tests/functional/dashboard/vagrant_variables.yml create mode 100644 tox-dashboard.ini diff --git a/tests/functional/dashboard/Vagrantfile b/tests/functional/dashboard/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/dashboard/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/dashboard/ceph-override.json b/tests/functional/dashboard/ceph-override.json new file mode 100644 index 000000000..e7d6137a6 --- /dev/null +++ b/tests/functional/dashboard/ceph-override.json @@ -0,0 +1,26 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12, + "osd_pool_default_size": 1, + "debug_ms": 20 + }, + "osd": { + "debug_bluefs": 20, + "debug_bluestore": 20 + } + }, + "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/dashboard/container/Vagrantfile b/tests/functional/dashboard/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/dashboard/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/dashboard/container/ceph-override.json b/tests/functional/dashboard/container/ceph-override.json new file mode 120000 index 000000000..772bdc5f5 --- /dev/null +++ b/tests/functional/dashboard/container/ceph-override.json @@ -0,0 +1 @@ +../ceph-override.json \ No newline at end of file diff --git a/tests/functional/dashboard/container/group_vars/all b/tests/functional/dashboard/container/group_vars/all new file mode 100644 index 000000000..9fab0936f --- /dev/null +++ b/tests/functional/dashboard/container/group_vars/all @@ -0,0 +1,19 @@ +--- +# 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' }}" +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 +ceph_conf_overrides: + global: + osd_pool_default_size: 1 +openstack_config: False +dashboard_enabled: True \ No newline at end of file diff --git a/tests/functional/dashboard/container/group_vars/mons b/tests/functional/dashboard/container/group_vars/mons new file mode 100644 index 000000000..8a91e9612 --- /dev/null +++ b/tests/functional/dashboard/container/group_vars/mons @@ -0,0 +1,10 @@ +--- +create_crush_tree: False +crush_rule_config: False +crush_rule_hdd: + name: HDD + root: HDD + type: host + default: true +crush_rules: + - "{{ crush_rule_hdd }}" diff --git a/tests/functional/dashboard/container/group_vars/osds b/tests/functional/dashboard/container/group_vars/osds new file mode 100644 index 000000000..9cea91d6a --- /dev/null +++ b/tests/functional/dashboard/container/group_vars/osds @@ -0,0 +1,10 @@ +--- +ceph_osd_docker_run_script_path: /var/tmp +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/dashboard/container/hosts b/tests/functional/dashboard/container/hosts new file mode 100644 index 000000000..6236a6ffa --- /dev/null +++ b/tests/functional/dashboard/container/hosts @@ -0,0 +1,12 @@ +[mons] +mon0 monitor_address=192.168.19.10 + +[mgrs] +mon0 + +[osds] +osd0 +osd1 + +[grafana-server] +mon0 \ No newline at end of file diff --git a/tests/functional/dashboard/container/hosts-ubuntu b/tests/functional/dashboard/container/hosts-ubuntu new file mode 100644 index 000000000..b72bd67f7 --- /dev/null +++ b/tests/functional/dashboard/container/hosts-ubuntu @@ -0,0 +1,15 @@ +[mons] +mon0 monitor_address=192.168.19.10 + +[mgrs] +mon0 + +[osds] +osd0 +osd1 + +[grafana-server] +mon0 + +[all:vars] +debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] diff --git a/tests/functional/dashboard/container/vagrant_variables.yml b/tests/functional/dashboard/container/vagrant_variables.yml new file mode 100644 index 000000000..6e14fcf09 --- /dev/null +++ b/tests/functional/dashboard/container/vagrant_variables.yml @@ -0,0 +1,60 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: True + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 2 +mds_vms: 0 +rgw_vms: 0 +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.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: /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/dashboard/group_vars/all b/tests/functional/dashboard/group_vars/all new file mode 100644 index 000000000..88aa1ea96 --- /dev/null +++ b/tests/functional/dashboard/group_vars/all @@ -0,0 +1,11 @@ +--- +ceph_origin: repository +ceph_repository: community +public_network: "192.168.25.0/24" +cluster_network: "192.168.26.0/24" +radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}" +ceph_conf_overrides: + global: + osd_pool_default_size: 1 +openstack_config: False +dashboard_enabled: True \ No newline at end of file diff --git a/tests/functional/dashboard/group_vars/mons b/tests/functional/dashboard/group_vars/mons new file mode 100644 index 000000000..346335178 --- /dev/null +++ b/tests/functional/dashboard/group_vars/mons @@ -0,0 +1,10 @@ +--- +create_crush_tree: False +crush_rule_config: False +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/dashboard/group_vars/osds b/tests/functional/dashboard/group_vars/osds new file mode 100644 index 000000000..3ec1d6e4c --- /dev/null +++ b/tests/functional/dashboard/group_vars/osds @@ -0,0 +1,11 @@ +--- +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +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/dashboard/hosts b/tests/functional/dashboard/hosts new file mode 100644 index 000000000..483531e43 --- /dev/null +++ b/tests/functional/dashboard/hosts @@ -0,0 +1,12 @@ +[mons] +mon0 monitor_address=192.168.25.10 + +[mgrs] +mon0 + +[osds] +osd0 +osd1 + +[grafana-server] +mon0 \ No newline at end of file diff --git a/tests/functional/dashboard/hosts-ubuntu b/tests/functional/dashboard/hosts-ubuntu new file mode 100644 index 000000000..9b9adb2be --- /dev/null +++ b/tests/functional/dashboard/hosts-ubuntu @@ -0,0 +1,15 @@ +[mons] +mon0 monitor_address=192.168.25.10 + +[mgrs] +mon0 + +[osds] +osd0 +osd1 + +[grafana-server] +mon0 + +[all:vars] +debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] diff --git a/tests/functional/dashboard/vagrant_variables.yml b/tests/functional/dashboard/vagrant_variables.yml new file mode 100644 index 000000000..788ee81cb --- /dev/null +++ b/tests/functional/dashboard/vagrant_variables.yml @@ -0,0 +1,73 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 2 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.25 +cluster_subnet: 192.168.26 + +# 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/tox-dashboard.ini b/tox-dashboard.ini new file mode 100644 index 000000000..656c2bdd8 --- /dev/null +++ b/tox-dashboard.ini @@ -0,0 +1,69 @@ +[tox] +envlist = dev-{centos,ubuntu}-{container,non_container}-dashboard + +skipsdist = True + +[testenv] +whitelist_externals = + vagrant + bash + cp + git + pip +passenv=* +setenv= + ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config + ANSIBLE_CONFIG = {toxinidir}/ansible.cfg + ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions + ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback + ANSIBLE_CALLBACK_WHITELIST = profile_tasks + ANSIBLE_CACHE_PLUGIN = memory + ANSIBLE_GATHERING = implicit + # only available for ansible >= 2.5 + ANSIBLE_STDOUT_CALLBACK = yaml +# non_container: DEV_SETUP = True + centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 + fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host + # Set the vagrant box image to use + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 + centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64 + + # Set the ansible inventory host file to be used according to which distrib we are running on + ubuntu: _INVENTORY = hosts-ubuntu + INVENTORY = {env:_INVENTORY:hosts} + container: CONTAINER_DIR = /container + container: PLAYBOOK = site-docker.yml.sample + non_container: PLAYBOOK = site.yml.sample + + CEPH_DOCKER_IMAGE_TAG = latest-nautilus + CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus + CEPH_DOCKER_IMAGE_TAG = latest-master + CEPH_DEV_BRANCH = master + CEPH_DEV_SHA1 = latest + CEPH_STABLE_RELEASE = nautilus + +deps= -r{toxinidir}/tests/requirements.txt +changedir={toxinidir}/tests/functional/dashboard{env:CONTAINER_DIR:} +commands= + vagrant up --no-provision {posargs:--provider=virtualbox} + bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} + + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml + + # configure lvm + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm" + + non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK} --extra-vars "\ + fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ + ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ + ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ + ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-master} \ + ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \ + ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ + " + + bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:nautilus} py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests" + + vagrant destroy --force