From 0d648800c5f4c91a09e3fb8ad4f4c36770197fa0 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 8 Aug 2017 11:44:22 -0500 Subject: [PATCH] ceph-volume: adds the xenial distro factor Signed-off-by: Andrew Schoen (cherry picked from commit 1b4275417d457e56eb0c3ac07597447cad7737ae) --- .../ceph_volume/tests/functional/tox.ini | 3 +- .../functional/xenial/create/Vagrantfile | 1 + .../functional/xenial/create/group_vars/all | 21 ++++++ .../tests/functional/xenial/create/hosts | 5 ++ .../xenial/create/vagrant_variables.yml | 74 +++++++++++++++++++ 5 files changed, 103 insertions(+), 1 deletion(-) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/xenial/create/Vagrantfile create mode 100644 src/ceph-volume/ceph_volume/tests/functional/xenial/create/group_vars/all create mode 100644 src/ceph-volume/ceph_volume/tests/functional/xenial/create/hosts create mode 100644 src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/tox.ini index adb3e1ad20967..99979d1429c75 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/tox.ini +++ b/src/ceph-volume/ceph_volume/tests/functional/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {centos7}-{create,prepare_activate} +envlist = {centos7,xenial}-{create,prepare_activate} skipsdist = True [testenv] @@ -19,6 +19,7 @@ deps= pytest-xdist changedir= centos7-create: {toxinidir}/centos7/create + xenial-create: {toxinidir}/xenial/create prepare_activate: {toxinidir}/prepare_activate commands= git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible diff --git a/src/ceph-volume/ceph_volume/tests/functional/xenial/create/Vagrantfile b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/Vagrantfile new file mode 120000 index 0000000000000..2572fa2c9f694 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/Vagrantfile @@ -0,0 +1 @@ +../../Vagrantfile \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/xenial/create/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/group_vars/all new file mode 100644 index 0000000000000..971c63d40e777 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/group_vars/all @@ -0,0 +1,21 @@ +--- + +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 +copy_admin_key: true +# test-volume is created by tests/functional/lvm_setup.yml from /dev/sda +lvm_volumes: + test_volume: /dev/sdc +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/xenial/create/hosts b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/hosts new file mode 100644 index 0000000000000..f6a265ab3e5d6 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml new file mode 100644 index 0000000000000..2e5df09ab4d5a --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# 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 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# INSTALL SOURCE OF CEPH +# valid values are 'stable' and 'dev' +ceph_install_source: stable + +# 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' + +# 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: ceph/ubuntu-xenial +#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 + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } -- 2.39.5