From 5529552d2f01d5f2d3d00b07ca8b059eb2d9543b Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 7 Feb 2020 17:02:06 +0100 Subject: [PATCH] ceph-volume: port lvm functional tests to centos Signed-off-by: Jan Fajerski --- .../all => group_vars/bluestore_lvm} | 2 +- .../all => group_vars/bluestore_lvm_dmcrypt} | 2 +- .../all => group_vars/filestore_lvm} | 6 +- .../all => group_vars/filestore_lvm_dmcrypt} | 6 +- .../bluestore/create/vagrant_variables.yml | 56 ------------------- .../bluestore/dmcrypt/vagrant_variables.yml | 56 ------------------- .../filestore/create/vagrant_variables.yml | 56 ------------------- .../filestore/dmcrypt/vagrant_variables.yml | 56 ------------------- .../bluestore/create/Vagrantfile | 0 .../centos8/bluestore/create/group_vars/all | 1 + .../bluestore/create/hosts | 0 .../bluestore/create/setup.yml | 0 .../bluestore/create/test.yml | 0 .../bluestore/create/vagrant_variables.yml | 1 + .../bluestore/dmcrypt/Vagrantfile | 0 .../centos8/bluestore/dmcrypt/group_vars/all | 1 + .../bluestore/dmcrypt/hosts | 0 .../bluestore/dmcrypt/setup.yml | 0 .../bluestore/dmcrypt/test.yml | 12 ++-- .../bluestore/dmcrypt/vagrant_variables.yml | 1 + .../filestore/create/Vagrantfile | 0 .../centos8/filestore/create/group_vars/all | 1 + .../filestore/create/hosts | 0 .../filestore/create/setup.yml | 0 .../filestore/create/test.yml | 0 .../filestore/create/vagrant_variables.yml | 1 + .../filestore/dmcrypt/Vagrantfile | 0 .../centos8/filestore/dmcrypt/group_vars/all | 1 + .../filestore/dmcrypt/hosts | 0 .../filestore/dmcrypt/setup.yml | 0 .../filestore/dmcrypt/test.yml | 30 +++++----- .../filestore/dmcrypt/vagrant_variables.yml | 1 + .../lvm/playbooks/setup_partitions.yml | 8 +-- .../lvm/playbooks/test_bluestore.yml | 12 ++-- .../lvm/playbooks/test_filestore.yml | 26 ++++----- .../ceph_volume/tests/functional/lvm/tox.ini | 14 ++--- 36 files changed, 67 insertions(+), 283 deletions(-) rename src/ceph-volume/ceph_volume/tests/functional/{lvm/centos7/bluestore/create/group_vars/all => group_vars/bluestore_lvm} (96%) rename src/ceph-volume/ceph_volume/tests/functional/{lvm/centos7/bluestore/dmcrypt/group_vars/all => group_vars/bluestore_lvm_dmcrypt} (96%) rename src/ceph-volume/ceph_volume/tests/functional/{lvm/centos7/filestore/create/group_vars/all => group_vars/filestore_lvm} (91%) rename src/ceph-volume/ceph_volume/tests/functional/{lvm/centos7/filestore/dmcrypt/group_vars/all => group_vars/filestore_lvm_dmcrypt} (91%) delete mode 100644 src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/vagrant_variables.yml delete mode 100644 src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/vagrant_variables.yml delete mode 100644 src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/vagrant_variables.yml delete mode 100644 src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/vagrant_variables.yml rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/create/Vagrantfile (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/group_vars/all rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/create/hosts (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/create/setup.yml (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/create/test.yml (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/vagrant_variables.yml rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/dmcrypt/Vagrantfile (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/group_vars/all rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/dmcrypt/hosts (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/dmcrypt/setup.yml (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/bluestore/dmcrypt/test.yml (92%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/vagrant_variables.yml rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/create/Vagrantfile (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/group_vars/all rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/create/hosts (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/create/setup.yml (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/create/test.yml (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/vagrant_variables.yml rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/dmcrypt/Vagrantfile (100%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/group_vars/all rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/dmcrypt/hosts (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/dmcrypt/setup.yml (100%) rename src/ceph-volume/ceph_volume/tests/functional/lvm/{centos7 => centos8}/filestore/dmcrypt/test.yml (81%) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/vagrant_variables.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm similarity index 96% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all rename to src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm index 01ae1dae90b3..65dc95233026 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm @@ -19,7 +19,7 @@ lvm_volumes: data_vg: test_group db: journal1 db_vg: journals - - data: /dev/sdd1 + - data: /dev/vdd1 os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt similarity index 96% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all rename to src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt index 9d4f50de7afa..93c870a36db0 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt @@ -20,7 +20,7 @@ lvm_volumes: data_vg: test_group db: journal1 db_vg: journals - - data: /dev/sdd1 + - data: /dev/vdd1 os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm similarity index 91% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all rename to src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm index 5af1b7ac4ab0..cc40419d6e69 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm @@ -14,15 +14,15 @@ copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 - journal: /dev/sdc1 + journal: /dev/vdc1 data_vg: test_group crush_device_class: test - data: data-lv2 journal: journal1 data_vg: test_group journal_vg: journals - - data: /dev/sdd1 - journal: /dev/sdd2 + - data: /dev/vdd1 + journal: /dev/vdd2 os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt similarity index 91% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all rename to src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt index 7544678b9c93..d0910837275f 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt @@ -15,15 +15,15 @@ copy_admin_key: false # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda lvm_volumes: - data: data-lv1 - journal: /dev/sdc1 + journal: /dev/vdc1 data_vg: test_group crush_device_class: test - data: data-lv2 journal: journal1 data_vg: test_group journal_vg: journals - - data: /dev/sdd1 - journal: /dev/sdd2 + - data: /dev/vdd1 + journal: /dev/vdd2 os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/vagrant_variables.yml deleted file mode 100644 index 7d1a4449a634..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/vagrant_variables.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - - -# 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: / -# 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/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/vagrant_variables.yml deleted file mode 100644 index 7d1a4449a634..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/vagrant_variables.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - - -# 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: / -# 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/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/vagrant_variables.yml deleted file mode 100644 index 7d1a4449a634..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/vagrant_variables.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - - -# 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: / -# 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/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/vagrant_variables.yml deleted file mode 100644 index 7d1a4449a634..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/vagrant_variables.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - - -# 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: / -# 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/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/Vagrantfile similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/Vagrantfile rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/Vagrantfile diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/group_vars/all new file mode 120000 index 000000000000..5a7af3be06bf --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/group_vars/all @@ -0,0 +1 @@ +../../../../../group_vars/bluestore_lvm \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/hosts similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/hosts rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/hosts diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/setup.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/setup.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/setup.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/test.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/create/test.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/test.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/vagrant_variables.yml new file mode 120000 index 000000000000..d21531f6cec8 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/create/vagrant_variables.yml @@ -0,0 +1 @@ +../../../../vagrant_variables.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/Vagrantfile similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/Vagrantfile rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/Vagrantfile diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/group_vars/all new file mode 120000 index 000000000000..6ef6a98441e3 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/group_vars/all @@ -0,0 +1 @@ +../../../../../group_vars/bluestore_lvm_dmcrypt \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/hosts b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/hosts similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/hosts rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/hosts diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/setup.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/setup.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/setup.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/test.yml similarity index 92% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/test.yml index bbd5b45d3438..a05eef6eddd0 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/test.yml @@ -27,15 +27,15 @@ tasks: # osd.2 device - - name: zap /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd1 --destroy" + - name: zap /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy" environment: CEPH_VOLUME_DEBUG: 1 # partitions have been completely removed, so re-create them again - - name: re-create partition /dev/sdd for lvm data usage + - name: re-create partition /dev/vdd for lvm data usage parted: - device: /dev/sdd + device: /dev/vdd number: 1 part_start: 0% part_end: 50% @@ -43,8 +43,8 @@ label: gpt state: present - - name: redeploy osd.2 using /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/sdd1 --osd-id 2" + - name: redeploy osd.2 using /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/vdd1 --osd-id 2" environment: CEPH_VOLUME_DEBUG: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/vagrant_variables.yml new file mode 120000 index 000000000000..d21531f6cec8 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/bluestore/dmcrypt/vagrant_variables.yml @@ -0,0 +1 @@ +../../../../vagrant_variables.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/Vagrantfile similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/Vagrantfile rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/Vagrantfile diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/group_vars/all new file mode 120000 index 000000000000..d6c71453af79 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/group_vars/all @@ -0,0 +1 @@ +../../../../../group_vars/filestore_lvm \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/hosts similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/hosts rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/hosts diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/setup.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/setup.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/setup.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/test.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/create/test.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/test.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/vagrant_variables.yml new file mode 120000 index 000000000000..d21531f6cec8 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/create/vagrant_variables.yml @@ -0,0 +1 @@ +../../../../vagrant_variables.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/Vagrantfile similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/Vagrantfile rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/Vagrantfile diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/group_vars/all new file mode 120000 index 000000000000..a175127551ba --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/group_vars/all @@ -0,0 +1 @@ +../../../../../group_vars/filestore_lvm_dmcrypt \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/hosts b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/hosts similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/hosts rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/hosts diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/setup.yml similarity index 100% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/setup.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/setup.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/test.yml similarity index 81% rename from src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml rename to src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/test.yml index 91c9a1b84027..f0408736ebfa 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/test.yml @@ -30,20 +30,20 @@ tasks: # osd.2 device - - name: zap /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd1 --destroy" + - name: zap /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy" environment: CEPH_VOLUME_DEBUG: 1 - - name: zap /dev/sdd2 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd2 --destroy" + - name: zap /dev/vdd2 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd2 --destroy" environment: CEPH_VOLUME_DEBUG: 1 # partitions have been completely removed, so re-create them again - - name: re-create partition /dev/sdd for lvm data usage + - name: re-create partition /dev/vdd for lvm data usage parted: - device: /dev/sdd + device: /dev/vdd number: 1 part_start: 0% part_end: 50% @@ -51,9 +51,9 @@ label: gpt state: present - - name: re-create partition /dev/sdd lvm journals + - name: re-create partition /dev/vdd lvm journals parted: - device: /dev/sdd + device: /dev/vdd number: 2 part_start: 50% part_end: 100% @@ -61,8 +61,8 @@ state: present label: gpt - - name: redeploy osd.2 using /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm create --filestore --data /dev/sdd1 --journal /dev/sdd2 --osd-id 2" + - name: redeploy osd.2 using /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm create --filestore --data /dev/vdd1 --journal /dev/vdd2 --osd-id 2" environment: CEPH_VOLUME_DEBUG: 1 @@ -72,14 +72,14 @@ environment: CEPH_VOLUME_DEBUG: 1 - - name: zap /dev/sdc1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdc1 --destroy" + - name: zap /dev/vdc1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdc1 --destroy" environment: CEPH_VOLUME_DEBUG: 1 - - name: re-create partition /dev/sdc1 + - name: re-create partition /dev/vdc1 parted: - device: /dev/sdc + device: /dev/vdc number: 1 part_start: 0% part_end: 50% @@ -88,7 +88,7 @@ label: gpt - name: prepare osd.0 again using test_group/data-lv1 - command: "ceph-volume --cluster {{ cluster }} lvm prepare --filestore --data test_group/data-lv1 --journal /dev/sdc1 --osd-id 0" + command: "ceph-volume --cluster {{ cluster }} lvm prepare --filestore --data test_group/data-lv1 --journal /dev/vdc1 --osd-id 0" environment: CEPH_VOLUME_DEBUG: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/vagrant_variables.yml new file mode 120000 index 000000000000..d21531f6cec8 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos8/filestore/dmcrypt/vagrant_variables.yml @@ -0,0 +1 @@ +../../../../vagrant_variables.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/setup_partitions.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/setup_partitions.yml index 37a48949b219..4b9e6638ed51 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/setup_partitions.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/setup_partitions.yml @@ -5,9 +5,9 @@ become: yes tasks: - - name: partition /dev/sdd for lvm data usage + - name: partition /dev/vdd for lvm data usage parted: - device: /dev/sdd + device: /dev/vdd number: 1 part_start: 0% part_end: 50% @@ -15,9 +15,9 @@ label: gpt state: present - - name: partition /dev/sdd lvm journals + - name: partition /dev/vdd lvm journals parted: - device: /dev/sdd + device: /dev/vdd number: 2 part_start: 50% part_end: 100% diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml index 1e9b8c3e05e8..e8cf077c6cb8 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml @@ -30,15 +30,15 @@ tasks: # osd.2 device - - name: zap /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd1 --destroy" + - name: zap /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy" environment: CEPH_VOLUME_DEBUG: 1 # partitions have been completely removed, so re-create them again - - name: re-create partition /dev/sdd for lvm data usage + - name: re-create partition /dev/vdd for lvm data usage parted: - device: /dev/sdd + device: /dev/vdd number: 1 part_start: 0% part_end: 50% @@ -46,8 +46,8 @@ label: gpt state: present - - name: redeploy osd.2 using /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/sdd1 --osd-id 2" + - name: redeploy osd.2 using /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/vdd1 --osd-id 2" environment: CEPH_VOLUME_DEBUG: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml index 4e43839e8ca4..9239a3624653 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml @@ -30,21 +30,21 @@ tasks: # osd.2 device - - name: zap /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd1 --destroy" + - name: zap /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy" environment: CEPH_VOLUME_DEBUG: 1 # osd.2 journal - - name: zap /dev/sdd2 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdd2 --destroy" + - name: zap /dev/vdd2 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd2 --destroy" environment: CEPH_VOLUME_DEBUG: 1 # partitions have been completely removed, so re-create them again - - name: re-create partition /dev/sdd for lvm data usage + - name: re-create partition /dev/vdd for lvm data usage parted: - device: /dev/sdd + device: /dev/vdd number: 1 part_start: 0% part_end: 50% @@ -52,9 +52,9 @@ label: gpt state: present - - name: re-create partition /dev/sdd lvm journals + - name: re-create partition /dev/vdd lvm journals parted: - device: /dev/sdd + device: /dev/vdd number: 2 part_start: 50% part_end: 100% @@ -62,8 +62,8 @@ state: present label: gpt - - name: redeploy osd.2 using /dev/sdd1 - command: "ceph-volume --cluster {{ cluster }} lvm create --filestore --data /dev/sdd1 --journal /dev/sdd2 --osd-id 2" + - name: redeploy osd.2 using /dev/vdd1 + command: "ceph-volume --cluster {{ cluster }} lvm create --filestore --data /dev/vdd1 --journal /dev/vdd2 --osd-id 2" environment: CEPH_VOLUME_DEBUG: 1 @@ -76,13 +76,13 @@ CEPH_VOLUME_DEBUG: 1 # osd.0 journal device (zap without --destroy that removes the LV) - - name: zap /dev/sdc1 - command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/sdc1" + - name: zap /dev/vdc1 + command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdc1" environment: CEPH_VOLUME_DEBUG: 1 - name: prepare osd.0 again using test_group/data-lv1 - command: "ceph-volume --cluster {{ cluster }} lvm prepare --filestore --data test_group/data-lv1 --journal /dev/sdc1 --osd-id 0" + command: "ceph-volume --cluster {{ cluster }} lvm prepare --filestore --data test_group/data-lv1 --journal /dev/vdc1 --osd-id 0" environment: CEPH_VOLUME_DEBUG: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini index bd1afaf80687..1dd7c999f0ba 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = centos7-{filestore,bluestore}-{create,prepare_activate,dmcrypt} +envlist = centos8-{filestore,bluestore}-{create,prepare_activate,dmcrypt} skipsdist = True [testenv] @@ -22,15 +22,15 @@ setenv= DEBIAN_FRONTEND=noninteractive changedir= # plain/unencrypted - centos7-filestore-create: {toxinidir}/centos7/filestore/create - centos7-bluestore-create: {toxinidir}/centos7/bluestore/create + centos8-filestore-create: {toxinidir}/centos8/filestore/create + centos8-bluestore-create: {toxinidir}/centos8/bluestore/create # dmcrypt - centos7-filestore-dmcrypt: {toxinidir}/centos7/filestore/dmcrypt - centos7-bluestore-dmcrypt: {toxinidir}/centos7/bluestore/dmcrypt + centos8-filestore-dmcrypt: {toxinidir}/centos8/filestore/dmcrypt + centos8-bluestore-dmcrypt: {toxinidir}/centos8/bluestore/dmcrypt # TODO: these are placeholders for now, eventually we want to # test the prepare/activate workflow of ceph-volume as well - centos7-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate - centos7-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate + centos8-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate + centos8-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate commands= git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt -- 2.47.3