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
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
61551fa37d
Merge pull request #1152 from ceph/gitignore-travis
...
Gitignore travis
2016-12-06 10:19:23 +01:00
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
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
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
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
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
1574e8f4ab
tests: make centos7_cluster use three mons
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 17:27:09 -06:00
155bcf5ae2
tests: rename the directory for centos7_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:59:27 -06:00
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
da6d68c042
tests: rename the directory for xenial_cluster
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 16:49:40 -06:00
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
d1e2a1d680
Merge pull request #1138 from ceph/docker-scenario
...
tests: adds a docker_cluster scenario
2016-12-01 13:56:54 -08:00
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
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
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
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
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
330d64c541
tests: docker_cluster should use 3 mons
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:55 -06:00
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
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
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
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
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
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
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
11c13ad7c0
tests: adds a docker_cluster scenario
...
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-01 10:28:54 -06:00
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
bb57238115
Merge pull request #1139 from ceph/last-cleanup-apache
...
common: remove apache file
2016-12-01 11:04:48 +01:00
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
75d0c5d4fd
Merge pull request #1135 from guits/master
...
Add gluster nfs ganesha repo only for Ubuntu
2016-11-30 17:17:48 +01:00
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
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
945525934e
Merge pull request #1131 from guits/refact_code
...
Refact temporary vars in ceph-common defaults.
2016-11-30 15:46:15 +01:00
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
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
9f0b3ceb6b
rm ceph-extra.repo and redhat_distro_ceph_extra variable
...
We removed the "apache" setting for "radosgw_frontend" in
adfdf6871e
2016-11-29 14:42:34 -07:00
91ed7049b9
Merge pull request #1130 from ceph/colocated-tests
...
initial pass on tests for collocated journals
2016-11-29 15:40:25 -06:00
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
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
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
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
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
9924712a36
Merge pull request #1127 from ceph/osd-scenarios
...
testing dmcrypt OSD scenarios
2016-11-28 16:47:50 -05:00
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
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
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
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
34a59695f8
contrib: don't fetch tags since we push force
...
reverting 4be9c52baf
2016-11-28 19:07:52 +01:00
Sébastien Han
chenyanshan
Alfredo Deza
Andrew Schoen
Ivan Font
Guillaume Abrioux
Andrew Schoen
Ken Dreyer
Alfredo Deza