Andrew Schoen
4effce1c31
tests: use node["conf_path"] instead of hardcoding the path in tests
...
This also accounts for the cluster having a custom cluster name
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:58:06 -06:00
Andrew Schoen
4e3eb7b627
tests: add cluster_name and conf_path to the node fixture
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:58:05 -06:00
Andrew Schoen
2464b69612
tests: include the number of mons as a attribute on node
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:57:20 -06:00
Andrew Schoen
1abbc948d9
tests: update skip messages in conftest.py
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
d79188c8b6
tests: rename vars to ansible_vars in conftest.node
...
This is to avoid redefining the builtin vars()
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
5f81638b5e
tests: rename CephNode to node and add a bit of documentation
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
73705933c9
tests: with testinfra we don't need scenario.py files anymore
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
1e79bc6726
tests: tests for collocated journals
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
1b3aca44d7
tests: add a journal_collocation tag to collocated journal tests
...
The test will be skipped if journal_collocation is not True in the
group_vars for the scenario.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
dddfe6d9de
tests: ensure ceph-mon is installed on mons
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:20 -06:00
Andrew Schoen
8ed8dfd907
tests: make sure all osds are mounted
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
0665167afa
tests: adds some basic tests for OSD nodes
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
e13da73a5e
testing: CephNode should return osd_ids
...
This is an empty list on anything but an OSD node. These ids will be
used for further OSD testing.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
0e7133cfd0
tests: remove test files that are not used anymore
...
These tests have been replaced by the ones in test_install.py
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
20f6831f8b
tests: test ceph.conf using testinfra modules
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
4810b38ece
tests: ensure tests marked with 'all' run on every node
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
cd9b47ceb8
tests: the CephNode fixture should provide the cluster subnet
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
a31c86c191
tests: tests mon services to ensure they are running correctly
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
7c1a45260d
tests: run testinfra with --sudo
...
It needs this so that the modules can use sudo
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
465bafc444
tests: run the setup.yml playbook with tox
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:19 -06:00
Andrew Schoen
4d5a3510e4
tests: include a playbook to install net-tools for socket checks
...
This playbook could be used in the future to install anything else we
need on these nodes for testing purposes.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:18 -06:00
Andrew Schoen
05be43c546
tests: return address and ansible vars from CephNode
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:18 -06:00
Andrew Schoen
b5552239e7
tests: port tests/functional/test_install.py to use testinfra fixtures
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:18 -06:00
Andrew Schoen
c02ffdb0e0
tests: change conftest.py to support dynamic markers and test selection
...
This applies correct markers to tests depending on their file path.
Tests that live at the root of tests/functional/tests will be given a
marker of 'all' and apply to any type of ceph node.
Tests that live in tests/functional/tests/mon will get the
'mons' marker and will only run for nodes in the 'mons' group.
Tests that live in tests/functional/tests/osd will get the 'osds'
marker and will only run for nodes in the 'osds' group.
All tests must use the CephNode fixture for this to work and be
parameterized by testinfra.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:18 -06:00
Andrew Schoen
870a4358f0
tests: use testinfra in tox.ini instead of pytest directly
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-06 14:56:18 -06:00
Sébastien Han
a23007e7db
Merge pull request #1155 from ceph/take-over-fix
...
take-over: use more precise ceph.conf detection
2016-12-06 16:04:52 +01:00
Sébastien Han
9dac195200
take-over: use more precise ceph.conf detection
...
Prior to this patch we were just looking for any *.conf file which
sometimes could results in multiple matches. The new command looks for a
.conf file that must contain [global] and 'fsid' patterns. This will
definitely get us the ceph.conf file. We can not directly use ceph.conf
because of a different cluster name.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-06 16:02:48 +01:00
Sébastien Han
61551fa37d
Merge pull request #1152 from ceph/gitignore-travis
...
Gitignore travis
2016-12-06 10:19:23 +01:00
Sébastien Han
4444d7d78e
git: update gitignore
...
* ignore yml files in general
* refactor based on commit f8e043b6ea5ac4e886532d4f2f675c507b44b955 that
changed directory layouts
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit ec5c6f5da566611c4e0b88f925cbd26dc90368d6)
2016-12-06 10:18:19 +01:00
Sébastien Han
6707c82fa0
ci: remove travis
...
since now we have the ceph CI taking care of the syntax check we don't
need travis anymore. Thanks Travis you served us well!
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 9fbe65cb72e01c586af3a27788c8e3e9549e0abf)
2016-12-06 10:17:50 +01:00
Sébastien Han
80c018b575
Merge pull request #1144 from yanshanchen/fix-shrink-osd-regex
...
the pattern in regex_replace is not right when the pid of osd is bigger than 9999
2016-12-05 10:14:58 +01:00
chenyanshan
7eab2529ed
this patch fix the regex pattern in infrastructure-playbooks/shrink-osd.yml when the osd's pid num is bigger than 9999
...
Signed-off-by: chenyanshan <yanshanchen@139.com>
2016-12-05 13:40:38 +08:00
Alfredo Deza
0f3ae4c0b1
Merge pull request #1141 from ceph/more-mons
...
centos7_cluster and xenial_cluster scenarios should use 3 mons
2016-12-02 10:27:05 -05:00
Andrew Schoen
1574e8f4ab
tests: make centos7_cluster use three mons
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 17:27:09 -06:00
Andrew Schoen
155bcf5ae2
tests: rename the directory for centos7_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:59:27 -06:00
Andrew Schoen
234b2c1cc2
tests: removes unused xenial_conf_tests and xenial_mon_osd scenarios
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:56:06 -06:00
Andrew Schoen
da6d68c042
tests: rename the directory for xenial_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:49:40 -06:00
Andrew Schoen
5b9cb48774
tests: add 2 more mons to xenial_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:46:05 -06:00
Ivan Font
d1e2a1d680
Merge pull request #1138 from ceph/docker-scenario
...
tests: adds a docker_cluster scenario
2016-12-01 13:56:54 -08:00
Andrew Schoen
9f887f6064
tests: remove unused group_vars/osds from docker_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 14:50:21 -06:00
Andrew Schoen
de711f2996
tests: docker_cluster does not need os_tuning_params
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 14:49:31 -06:00
Andrew Schoen
2223713525
tests: docker_cluster should run conf_tests
...
This also makes the conf_tests take the subnet as input
so multiple scenarios on differing subnets can use these tests.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 12:18:01 -06:00
Andrew Schoen
7abbab820e
tests: use journal_size in ceph_osd_docker_extra_env for docker_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
Andrew Schoen
53a106a884
tests: remove unsued options from docker_cluster vagrant variables
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
Andrew Schoen
330d64c541
tests: docker_cluster should use 3 mons
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
Andrew Schoen
af568b7e62
tests: docker_cluster should use the site-docker.yml playbook
...
This commits allows for scenarios to pick their own playbook while
defaulting to use site.yml.sample.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
Andrew Schoen
e2f4d4ef56
ceph-rgw: default rgw_config_keys in defaults/main.yml
...
This avoid an issue with it being undefined if nfs_obj_gw is
set to False.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
Andrew Schoen
182f766cc4
tests: update the group_vars for docker_cluster
...
Fixes the monitor_interface and sets osd scenario config
options so the mandatory checks pass.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Andrew Schoen
913dc8e01e
ceph-rgw: no need to use playbook_dir when fetching configs for docker
...
This avoids a bug when fetch_directory is not a relative to the playbook
directory.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Andrew Schoen
bbbd8ff148
ceph-osd: no need to use playbook_dir when fetching configs for docker
...
This causes a bug when fetch_directory is not relative to the playbook
directory.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00