Commit Graph

1844 Commits (9281a564f2a6e10d28cbe5e5b33d94f3a64ff8da)
 

Author SHA1 Message Date
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Andrew Schoen 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
Alberto Murillo Silva 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

Signed-off-by: Alberto Murillo Silva <alberto.murillo.silva@intel.com>
2016-11-08 10:12:16 -06:00
Alfredo Deza 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
Andrew Schoen 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
Andrew Schoen e25042f65e Merge pull request #1058 from ceph/pytest-harness
testing harness with py.test and Vagrant
2016-11-04 14:08:35 -05:00
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Andrew Schoen 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
Andrew Schoen 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza d8b380c536 tests: placeholder pytest.ini to define test root dir
Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: pytest#harness
2016-11-04 13:59:32 -04:00
Leseb dbb4968f68 Merge pull request #1073 from ceph/upgrade
rolling_update: add variable to upgrade ceph
2016-11-04 17:34:12 +01:00
Sébastien Han 991341f525 rolling_update: add variable to upgrade ceph
My stupid self removed this crucial variable here: 217ce3ca thinking it
was another hard coded variable import where this is actually the
trigger for the upgrade.

Closes: #1071

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-04 17:31:02 +01:00
Sébastien Han a2fcd222d2 moving to ansible v2.2 compatibility
Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Julien Francoz julien@francoz.net
2016-11-04 10:09:38 +01:00
Ivan Font 85b766034b Merge pull request #1070 from ceph/RHBZ-1391675
rolling update: fix restarts of radosgw
2016-11-03 13:12:34 -07:00
Andrew Schoen 8262ce5e40 rolling update: fix restarts of radosgw
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rhbz#1391675
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-03 14:36:42 -05:00
Andrew Schoen 6115ad11d5 Merge pull request #1069 from ceph/dmycrypt-checks
osd dmcrypt: add ability to check devices
2016-11-03 10:28:22 -05:00
Leseb d4320d4dea Merge pull request #1065 from ceph/fix-conf-template
various fixes for the ceph.conf template
2016-11-03 15:30:51 +01:00
Andrew Schoen f87aabcb21 common: remove underscores in ceph.conf so config names are consistent
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-03 09:25:03 -05:00
Sébastien Han 32018f80a1 osd dmcrypt: add ability to check devices
Even for dmcrypt we need to check the "devices" status and
"raw_journal_devices" as well so we can fix them if there is something
wrong with them.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-03 15:20:07 +01:00
Leseb 08415f49c5 Merge pull request #1066 from eduardegorov/egorove_missed_file_for_PR_#1024
Adjust 'devices' list check for being not defined in purge-cluster pl…
2016-11-03 11:57:00 +01:00
Eduard Egorov ab5c9f2a67 Adjust 'devices' list check for being not defined in purge-cluster playbook (see PR #1024)
Signed-off-by: Eduard Egorov <eduard.egorov@icl-services.com>
2016-11-03 06:36:42 +00:00
Andrew Schoen 65544fb6aa ceph-common: remove unused mon_addr_interface.j2 template
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-02 15:36:03 -05:00
Andrew Schoen 66bf9eca20 ceph-common: remove unused mon_addr_address.j2 template
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-02 15:35:07 -05:00
Andrew Schoen 49dba08c05 fixes monitor_address and monitor_interface features
Before this commit if you had set monitor_interface in your
inventory file for a specific host it would be ignored and the value
in group_vars/all would have been used.

Also, this enables support for monitor_address again as it had been
broken by previous changes to this template.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-02 15:27:12 -05:00