From: Alfredo Deza Date: Fri, 10 Nov 2017 17:54:01 +0000 (-0500) Subject: ceph-volume tests.functional lvm move create to filestore/create X-Git-Tag: v12.2.2~22^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94a9f3f43d9c3a2ac08be4025e65c47c3767d2c1;p=ceph.git ceph-volume tests.functional lvm move create to filestore/create Signed-off-by: Alfredo Deza (cherry picked from commit d6905f3f620d4c733835e21a275d4127cdcb769b) --- diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile deleted file mode 120000 index 2572fa2c9f69..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../Vagrantfile \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/group_vars/all deleted file mode 100644 index e7c1f72300ae..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/group_vars/all +++ /dev/null @@ -1,29 +0,0 @@ ---- - -ceph_dev: True -cluster: ceph -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" -monitor_interface: eth1 -journal_size: 100 -osd_objectstore: "filestore" -osd_scenario: lvm -ceph_origin: 'repository' -ceph_repository: 'dev' -copy_admin_key: true -# test-volume is created by tests/functional/lvm_setup.yml from /dev/sda -lvm_volumes: - - data: data-lv1 - journal: /dev/sdc1 - data_vg: test_group - - data: data-lv2 - journal: journal1 - data_vg: test_group - journal_vg: journals -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/hosts deleted file mode 100644 index f6a265ab3e5d..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml deleted file mode 100644 index 7d1a4449a634..000000000000 --- a/src/ceph-volume/ceph_volume/tests/functional/centos7/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/centos7/filestore/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/group_vars/all new file mode 100644 index 000000000000..e7c1f72300ae --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/group_vars/all @@ -0,0 +1,29 @@ +--- + +ceph_dev: True +cluster: ceph +public_network: "192.168.3.0/24" +cluster_network: "192.168.4.0/24" +monitor_interface: eth1 +journal_size: 100 +osd_objectstore: "filestore" +osd_scenario: lvm +ceph_origin: 'repository' +ceph_repository: 'dev' +copy_admin_key: true +# test-volume is created by tests/functional/lvm_setup.yml from /dev/sda +lvm_volumes: + - data: data-lv1 + journal: /dev/sdc1 + data_vg: test_group + - data: data-lv2 + journal: journal1 + data_vg: test_group + journal_vg: journals +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/hosts new file mode 100644 index 000000000000..f6a265ab3e5d --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/vagrant_variables.yml new file mode 100644 index 000000000000..7d1a4449a634 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/centos7/filestore/create/vagrant_variables.yml @@ -0,0 +1,56 @@ +--- + +# 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