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
Andrew Schoen
aeab09938a
ceph-mon: no need to include playbook_dir when fetching configs
...
This causes a bug when fetch_directory is not a relative path to the
playbook location.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Andrew Schoen
1e64eb7111
ceph-mon: adds static: no to an include to avoid an ansible bug
...
Adding that avoids this bug:
https://github.com/ansible/ansible/issues/18206
Without that you'll get failures like:
TASK [ceph-mon : set keys permissions]
*****************************************
task path:
/home/andrewschoen/ceph-ansible/roles/ceph-mon/tasks/ceph_keys.yml:31
fatal: [mon0]: FAILED! => {"failed": true, "msg": "'dict object' has no attribute 'stdout_lines'"}
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Andrew Schoen
11c13ad7c0
tests: adds a docker_cluster scenario
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Andrew Schoen
c7ea7f4e1e
tests: change the subnet on dmcrypt-journal-collocation
...
It was currently set conflicting with dmcrypt-journal
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
Sébastien Han
bb57238115
Merge pull request #1139 from ceph/last-cleanup-apache
...
common: remove apache file
2016-12-01 11:04:48 +01:00
Sébastien Han
20a11a3111
common: remove apache file
...
we recently dropped the support for apache with rgw, so this commit
removes the last remaining file.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-01 11:02:31 +01:00
Sébastien Han
75d0c5d4fd
Merge pull request #1135 from guits/master
...
Add gluster nfs ganesha repo only for Ubuntu
2016-11-30 17:17:48 +01:00
Guillaume Abrioux
c4b972cfd7
Add gluster nfs ganesha repo only for Ubuntu
...
According to the official documentation, adding PPA is not available for Debian.
2016-11-30 16:50:52 +01:00
Sébastien Han
153837c195
Merge pull request #1125 from guits/master
...
Use 'package' module instead of yum, apt and dnf
2016-11-30 15:50:23 +01:00
Sébastien Han
945525934e
Merge pull request #1131 from guits/refact_code
...
Refact temporary vars in ceph-common defaults.
2016-11-30 15:46:15 +01:00
Guillaume Abrioux
07b953f420
Refact temporary vars in ceph-common defaults.
...
These variables were defined here to be sure that
`roles/ceph-common/tasks/checks/check_mandatory_vars.yml` has all variables defined.
2016-11-30 14:36:56 +01:00
Andrew Schoen
c3cda79738
Merge pull request #1132 from ktdreyer/no-ceph-extra
...
rm ceph-extra.repo and redhat_distro_ceph_extra variable
2016-11-29 16:21:51 -06:00
Ken Dreyer
9f0b3ceb6b
rm ceph-extra.repo and redhat_distro_ceph_extra variable
...
We removed the "apache" setting for "radosgw_frontend" in
adfdf6871e
.
As part of that change, we removed the final references to
ceph-extra.repo, but I failed to clean up this file itself.
Now that nothing uses this file, delete it.
This file contained the sole reference to redhat_distro_ceph_extra, so
we can drop that variable as well.
2016-11-29 14:42:34 -07:00
Andrew Schoen
91ed7049b9
Merge pull request #1130 from ceph/colocated-tests
...
initial pass on tests for collocated journals
2016-11-29 15:40:25 -06:00
Alfredo Deza
10df63dcf9
tests: use underscores to prevent tox combinatorial issues
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests
2016-11-29 16:08:42 -05:00
Guillaume Abrioux
76220ed719
Use 'package' module instead of yum, apt and dnf
...
Refactor the code using 'package' module
Fix Issue #520
(However it doesn't cover all cases because some cases are not refactorable.
Ex: because of diverging packages name between distribution)
2016-11-29 17:29:11 +01:00
Alfredo Deza
d0b2b13f4f
tests: specify the devices for OSDs in the scenario for collocation
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests
2016-11-29 10:05:49 -05:00
Alfredo Deza
e7f734a082
tests: create tests for collocated journals
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests
2016-11-29 10:05:16 -05:00
Sébastien Han
3bdae23e42
contrib: untrap before calling popd
...
we need to untrap before calling popd if the script is being run from a
directory different than the git repo. popd will go back to the previous
directory and trap will execute reset_hard_origin function on EXIT.
If we are not in the righ directory, this will fail.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 23:22:49 +01:00
Alfredo Deza
9924712a36
Merge pull request #1127 from ceph/osd-scenarios
...
testing dmcrypt OSD scenarios
2016-11-28 16:47:50 -05:00
Andrew Schoen
138e5a9421
tests: change centos7-cluster to use raw_multi_journal
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 15:10:07 -06:00
Andrew Schoen
eae3463a9e
tests: change xenial-cluster to use raw_multi_journal
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 15:05:48 -06:00
Andrew Schoen
a05a1b9b0f
testing: change raw-multi-journal to journal-collocation
...
We want to test journal collocation here because we're gonna switch
xenial-cluster and centos7-cluster to use a dedicated journal.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 15:04:04 -06:00
Andrew Schoen
c6e96897ba
testing: rename the dmcrypt-dedicated-journal to dmcrypt-journal
...
We're going to assume all scenarios use a dedicated journal unless
otherwise specified.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 14:58:09 -06:00
Sébastien Han
34a59695f8
contrib: don't fetch tags since we push force
...
reverting 4be9c52baf
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 19:07:52 +01:00
Andrew Schoen
9a1863dd11
tests: make Vagrantfile a symlink for dmcrypt scenarios
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 12:06:25 -06:00
Andrew Schoen
c212162afb
tests: adds a scenario using OSD dmcrypt_journal_collocation
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 12:03:00 -06:00
Andrew Schoen
9f432bfb05
tests: adds a dmcrypt-dedicated-journal testing scenario
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 12:02:32 -06:00
Sébastien Han
eb22286452
contrib: use push force because of the CI
...
If we don't force push we won't be able to push new content from
jenkins.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 18:54:14 +01:00
Andrew Schoen
e3d45095d3
tests: rename the centos7-mon-osd scenario to raw-multi-journal
...
We really only need to test the raw-multi-journal OSD scenario on one
OS and it needed a better name to use with the CI.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-11-28 10:28:17 -06:00
Sébastien Han
4be9c52baf
contrib: do a fetch all so we don't push force
...
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 16:46:30 +01:00
Sébastien Han
ace0ec4ebc
Merge pull request #1124 from ceph/galaxy
...
contrib: It doesn't make sense to pull all tags
2016-11-28 15:14:44 +01:00
Sébastien Han
0530ff86f9
contrib: It doesn't make sense to pull all tags
...
On certain git versions running: git pull origin --tags ends up with the
following error: It doesn't make sense to pull all tags; you probably
meant: git fetch --tags
So removing the --tags since later in the execution we do a git fetch
--tags
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 15:12:40 +01:00
Sébastien Han
9281a564f2
Merge pull request #1123 from ceph/galaxy
...
contrib: add a goto basedir function
2016-11-28 14:35:35 +01:00
Sébastien Han
e9de87d66b
contrib: add a goto basedir function
...
This way if the script is not executed from the git directory we jump
into it, do our stuff and then go back to the dir where the user was.
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 14:27:28 +01:00
Sébastien Han
06c75c6939
Merge pull request #1121 from D3N14L/master
...
Reviewed all roles and site.yml.sample and added "always_run: true" where appropriate
2016-11-28 10:26:15 +01:00