]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: removes unused xenial_conf_tests and xenial_mon_osd scenarios
authorAndrew Schoen <aschoen@redhat.com>
Thu, 1 Dec 2016 22:56:06 +0000 (16:56 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Thu, 1 Dec 2016 22:56:06 +0000 (16:56 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
13 files changed:
tests/functional/ubuntu/16.04/mon-osd/Vagrantfile [deleted symlink]
tests/functional/ubuntu/16.04/mon-osd/group_vars/all [deleted file]
tests/functional/ubuntu/16.04/mon-osd/group_vars/osds [deleted file]
tests/functional/ubuntu/16.04/mon-osd/hosts [deleted file]
tests/functional/ubuntu/16.04/mon-osd/scenario.py [deleted file]
tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml [deleted file]
tests/functional/ubuntu/16.04/mon/Vagrantfile [deleted symlink]
tests/functional/ubuntu/16.04/mon/group_vars/all [deleted file]
tests/functional/ubuntu/16.04/mon/group_vars/osds [deleted file]
tests/functional/ubuntu/16.04/mon/hosts [deleted file]
tests/functional/ubuntu/16.04/mon/scenario.py [deleted file]
tests/functional/ubuntu/16.04/mon/vagrant_variables.yml [deleted file]
tox.ini

diff --git a/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile b/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/all b/tests/functional/ubuntu/16.04/mon-osd/group_vars/all
deleted file mode 100644 (file)
index 64626c5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.7.0/24"
-cluster_network: "192.168.8.0/24"
-journal_size: 100
-devices:
-  - '/dev/sdb'
-raw_journal_devices:
-  - '/dev/sdc'
-raw_multi_journal: True
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }
diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds b/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds
deleted file mode 100644 (file)
index ed9b23a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
----
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }
diff --git a/tests/functional/ubuntu/16.04/mon-osd/hosts b/tests/functional/ubuntu/16.04/mon-osd/hosts
deleted file mode 100644 (file)
index 89721c0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0 monitor_interface=eth1
-
-[osds]
-osd0
diff --git a/tests/functional/ubuntu/16.04/mon-osd/scenario.py b/tests/functional/ubuntu/16.04/mon-osd/scenario.py
deleted file mode 100644 (file)
index b017b8e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Basic information about ceph and its configuration
-ceph = {
-    'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
-}
-
-# remote nodes to test, with anything specific to them that might be useful for
-# tests to get. Each one of these can get requested as a py.test fixture to
-# validate information.
-nodes = {
-    'mon0': {
-        'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
-    },
-    'osd0': {
-        'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
-    }
-}
diff --git a/tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml
deleted file mode 100644 (file)
index 84363f4..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# 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
-
-# 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.7
-cluster_subnet: 192.168.8
-
-# 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 }
diff --git a/tests/functional/ubuntu/16.04/mon/Vagrantfile b/tests/functional/ubuntu/16.04/mon/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/ubuntu/16.04/mon/group_vars/all b/tests/functional/ubuntu/16.04/mon/group_vars/all
deleted file mode 100644 (file)
index a45a73a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.9.0/24"
-cluster_network: "192.168.10.0/24"
-journal_size: 100
-devices:
-  - '/dev/sdb'
-  - '/dev/sdc'
-journal_collocation: True
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }
diff --git a/tests/functional/ubuntu/16.04/mon/group_vars/osds b/tests/functional/ubuntu/16.04/mon/group_vars/osds
deleted file mode 100644 (file)
index ed9b23a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
----
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }
diff --git a/tests/functional/ubuntu/16.04/mon/hosts b/tests/functional/ubuntu/16.04/mon/hosts
deleted file mode 100644 (file)
index b988ffe..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[mons]
-mon0 monitor_address=192.168.9.10
-mon1 monitor_address=192.168.9.11
-mon2 monitor_interface=eth1
diff --git a/tests/functional/ubuntu/16.04/mon/scenario.py b/tests/functional/ubuntu/16.04/mon/scenario.py
deleted file mode 100644 (file)
index 2a084bd..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Basic information about ceph and its configuration
-ceph = {
-    'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
-}
-
-# remote nodes to test, with anything specific to them that might be useful for
-# tests to get. Each one of these can get requested as a py.test fixture to
-# validate information.
-nodes = {
-    'mon0': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-    'mon1': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-    'mon2': {
-        'username': 'vagrant',
-        'components': ['conf_tests']
-    },
-}
diff --git a/tests/functional/ubuntu/16.04/mon/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon/vagrant_variables.yml
deleted file mode 100644 (file)
index dea17e1..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 3
-osd_vms: 0
-mds_vms: 0
-rgw_vms: 0
-nfs_vms: 0
-rbd_mirror_vms: 0
-client_vms: 0
-iscsi_gw_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.9
-cluster_subnet: 192.168.10
-
-# 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 }
diff --git a/tox.ini b/tox.ini
index 1adbea8e0bd1de00f5dc83990e5500f1d4f86862..c78acc364e79753ba36cc26282500db4d46c6df3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {ansible2.2}-{xenial_conf_tests,xenial_mon_osd,xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster}
+envlist = {ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster}
 skipsdist = True
 
 [testenv]
@@ -17,10 +17,6 @@ deps=
   ansible2.2: ansible==2.2
   -r{toxinidir}/tests/requirements.txt
 changedir=
-  # test a 3 mon cluster and ensures ceph.conf is rendered correctly
-  xenial_conf_tests: {toxinidir}/tests/functional/ubuntu/16.04/mon
-  # tests a 1 mon 1 osd xenial cluster using raw_multi_journal OSD scenario
-  xenial_mon_osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario
   xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster
   # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario