c16fd4b148
ceph-rgw: add systemd condition
...
We have a fact that detects the package manager, so we can detect if
systemd is used. Radosgw was still using some old logic from Ubuntu.
Ubuntu 16.04 now has systemd so we don't need to configure rgw as it was
running on upstart.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-14 15:12:20 +01:00
55c5d22658
Merge pull request #1089 from ceph/vagrant-boxes
...
tests: adds a few more scenarios
2016-11-10 16:16:07 -05:00
118834b752
tests: adds comments to tox.ini describing each scenario
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
ca68d7ce17
tests: make the centos7-mon-osd scenario use raw_multi_journal
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
4a2e06cb45
tests: adds the centos7-cluster scenario to tox.ini
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
588aa8d8f3
tests: adds a scenario for a centos7 1mon 1osd 1mds 1rgw cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
c5b3378a18
tests: adds the xenial mon-osd-mds-rgw scenario as xenial-cluster
...
I tried adding the scenario as xenial-mon-osd-mds-rgw but for
whatever reason tox refused to select that environment. Changing the
name to xenial-cluster fixed that though.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
38ee310f8c
tests: adds a scenario to test a xenial 1mon 1osd 1mds 1rgw cluster
...
This scenario duplicates what we are currently doing with our
ceph-ansible testing using OVH and a single node, except now
we are using 4 separate nodes.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
3b75d44ed6
tests: make xenial-mon-osd use raw_multi_journal instead of collocation
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-10 12:05:23 -06:00
38d84ce595
Merge pull request #1087 from ceph/vagrant-boxes
...
use vagrant boxes that support libvirt and virtualbox
2016-11-09 12:09:00 +01:00
db657ed8e1
tests: provide a way use libvirt with vagrant and tox
...
This allows for:
tox -- --provider=libvirt
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-08 17:00:09 -06:00
0522d32e7e
tests: change the centos box to centos/7
...
This box supports both libvirt and virtualbox. Eventually we want to
be building our own boxes but this should work in the short term.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-08 16:49:26 -06:00
95bce703f1
tests: change the xenial box to yk0/ubuntu-xenial
...
This box supports both virtualbox and libvirt. Eventually
we want to be building our own vagrant boxes, but this might
work for now.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: vagrant#boxes
2016-11-08 15:48:16 -06:00
da7dd92e95
Merge pull request #1086 from ceph/testing-updates
...
testing: adds 3 new functional testing scenarios
2016-11-08 13:39:32 -05:00
df59ec6fae
tests: adds the vagrant_variables.yml that were previously ignored
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 12:37:05 -06:00
f0d9e17252
don't ignore vagrant_variables.yml in test directories
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 12:37:04 -06:00
99fc84276e
tests: updates tox to test the new scenarios
...
This also turns on -vv for ansible and adds an environment for
ansible==1.9.4 testing.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 12:37:04 -06:00
44503487c5
tests: adds a 1mon 1osd centos7 test scenario
...
This uses journal collocation for the osd.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 12:37:04 -06:00
4dd51ee3c6
tests: adds a 1mon 1osd xenial test scenario
...
This sets up the osd using journal collocation
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
a96d51fdfa
tests: ceph.conf tests for the xenial 3 mon cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
dba8694794
tests: adds a xenial 3 mon test scenario
...
This can be used to test if mon hosts and
mon initial members are being set properly with
multiple hosts.
Also, to verify that monitor_address and monitor_interface
options both work as described.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
f62d15bf20
tests: ignore folders created by ceph-ansible during testing
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-08 10:35:43 -06:00
06ce643f7d
common: reformat mon_initial_members with indention
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
dea9fbe9d0
common: provide a default for monitor_address_block
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
d213080d19
tests: remove the initial_members scenario
...
This was just a placeholder until we could get more valid scenarios in
place.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:43 -06:00
fcacf90939
common: check for monitor_interface before monitor_address in ceph.conf
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: testing#updates
2016-11-08 10:35:42 -06:00
d16a6b47f0
sync config_template plugin with master branch
...
ansible 2.2 deprecates first_available_file option which is used in
the config_template module by 'generate ceph configuration file' task.
This change syncs the config_module files from their master repository
in github.com/openstack/openstack/ansible-plugins which includes the fix
2f6cac2cf6
2016-11-08 10:12:16 -06:00
74ae307fea
Merge pull request #1074 from ceph/test-group-vars
...
functional test scenarios should include a group_vars dir
2016-11-07 12:16:06 -05:00
d5a7f3de8f
tests: require a group_vars folder in the scenario dir
...
This will allow for no changes needed in the ansible playbook command
when adding new scenarios. Each scenario will just need a hosts file and
a group_vars directory to define how the cluster should be setup.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-04 16:35:45 -05:00
e25042f65e
Merge pull request #1058 from ceph/pytest-harness
...
testing harness with py.test and Vagrant
2016-11-04 14:08:35 -05:00
3511e12253
tests: add a hosts file for the initial_members scenario
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 14:47:59 -04:00
4d78be41ef
tests: gitignore the .tox subdir
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
8427e5a4a3
tests: make the tox.ini config call the ssh config helper script
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
74f9f2bff9
tests: add a helper script to generate vagrant ssh configs
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
e319ccf691
tests: remove the need for a setenv entry per scenario in tox.ini
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
80e955cc40
tests: adds a tox.ini to run the functional tests
...
This currently tests the initial-members scenario for both ansible 2.1
and ansible 2.2. It assumes a hosts file and vagrant_ssh_config exists
in the scenario directory.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
8cda2db9c3
tests: mon_initial_members should look for the right hostname
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 14:13:30 -04:00
08e7103766
tests: fix helper to use the actual lines form ceph.conf
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:34 -04:00
1caacfd02b
tests: use a different vagrant box
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
0b044c89f3
tests: include the vagrant_variables.yml file specific to this scenario
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
77281609f8
tests: create a README with some explanation on how to use the test harness
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
69632b3ed2
tests: define a requirements.txt file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
ab805824ea
tests: create an example scenario file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
05dace442d
tests: create the conftest file that does all the magic
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
4b93837e4d
tests: add the symlinked Vagrantfile to initial_members
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
f828b3d3fc
create a scenario config file for mon initial members
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
cdac170cbf
tests: add __init__.py for functional tests
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:33 -04:00
757356d57e
tests: common basic tests for after installation
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:32 -04:00
fe7bfbb62f
tests: add __init__.py for mon tests
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:32 -04:00
d73843c36c
tests: create a test to check for mon_initial_members
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: pytest#harness
2016-11-04 13:59:32 -04:00
Sébastien Han
Alfredo Deza
Andrew Schoen
Alberto Murillo Silva
Andrew Schoen
Alfredo Deza