]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agomon: remove collect keys 1162/head
Sébastien Han [Wed, 7 Dec 2016 13:36:24 +0000 (14:36 +0100)]
mon: remove collect keys

Once the monitor process starts it will also trigger `ceph-create-keys`
which will collect the admin key and bootstrap keys. We used to force
this command because we were having issues on some distros like centos
7.0 and 7.1 not triggering this. This is fixed on centos 7.2 and not an
issue on ubuntu 14.04 or 16.04 so we can remove this task. If the
monitor hangs or fails to start the playbook will fail right after at
the "wait for client.admin key exists" task after 300sec.

Closes: #1161
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1152 from ceph/gitignore-travis
Sébastien Han [Tue, 6 Dec 2016 09:19:23 +0000 (10:19 +0100)]
Merge pull request #1152 from ceph/gitignore-travis

Gitignore travis

8 years agogit: update gitignore 1152/head
Sébastien Han [Thu, 1 Dec 2016 15:34:03 +0000 (16:34 +0100)]
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)

8 years agoci: remove travis
Sébastien Han [Thu, 1 Dec 2016 15:28:56 +0000 (16:28 +0100)]
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)

8 years agoMerge pull request #1144 from yanshanchen/fix-shrink-osd-regex
Sébastien Han [Mon, 5 Dec 2016 09:14:58 +0000 (10:14 +0100)]
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

8 years agothis patch fix the regex pattern in infrastructure-playbooks/shrink-osd.yml when... 1144/head
chenyanshan [Mon, 5 Dec 2016 05:40:38 +0000 (13:40 +0800)]
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>
8 years agoMerge pull request #1141 from ceph/more-mons
Alfredo Deza [Fri, 2 Dec 2016 15:27:05 +0000 (10:27 -0500)]
Merge pull request #1141 from ceph/more-mons

centos7_cluster and xenial_cluster scenarios should use 3 mons

8 years agotests: make centos7_cluster use three mons 1141/head
Andrew Schoen [Thu, 1 Dec 2016 23:27:09 +0000 (17:27 -0600)]
tests: make centos7_cluster use three mons

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: rename the directory for centos7_cluster
Andrew Schoen [Thu, 1 Dec 2016 22:59:27 +0000 (16:59 -0600)]
tests: rename the directory for centos7_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: removes unused xenial_conf_tests and xenial_mon_osd scenarios
Andrew Schoen [Thu, 1 Dec 2016 22:56:06 +0000 (16:56 -0600)]
tests: removes unused xenial_conf_tests and xenial_mon_osd scenarios

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: rename the directory for xenial_cluster
Andrew Schoen [Thu, 1 Dec 2016 22:48:06 +0000 (16:48 -0600)]
tests: rename the directory for xenial_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: add 2 more mons to xenial_cluster
Andrew Schoen [Thu, 1 Dec 2016 22:46:05 +0000 (16:46 -0600)]
tests: add 2 more mons to xenial_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1138 from ceph/docker-scenario
Ivan Font [Thu, 1 Dec 2016 21:56:54 +0000 (13:56 -0800)]
Merge pull request #1138 from ceph/docker-scenario

tests: adds a docker_cluster scenario

8 years agotests: remove unused group_vars/osds from docker_cluster 1138/head
Andrew Schoen [Thu, 1 Dec 2016 20:50:21 +0000 (14:50 -0600)]
tests: remove unused group_vars/osds from docker_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: docker_cluster does not need os_tuning_params
Andrew Schoen [Thu, 1 Dec 2016 20:49:31 +0000 (14:49 -0600)]
tests: docker_cluster does not need os_tuning_params

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: docker_cluster should run conf_tests
Andrew Schoen [Thu, 1 Dec 2016 17:12:46 +0000 (11:12 -0600)]
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>
8 years agotests: use journal_size in ceph_osd_docker_extra_env for docker_cluster
Andrew Schoen [Thu, 1 Dec 2016 16:27:48 +0000 (10:27 -0600)]
tests: use journal_size in ceph_osd_docker_extra_env for docker_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: remove unsued options from docker_cluster vagrant variables
Andrew Schoen [Thu, 1 Dec 2016 16:24:30 +0000 (10:24 -0600)]
tests: remove unsued options from docker_cluster vagrant variables

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: docker_cluster should use 3 mons
Andrew Schoen [Thu, 1 Dec 2016 16:21:29 +0000 (10:21 -0600)]
tests: docker_cluster should use 3 mons

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: docker_cluster should use the site-docker.yml playbook
Andrew Schoen [Thu, 1 Dec 2016 16:19:19 +0000 (10:19 -0600)]
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>
8 years agoceph-rgw: default rgw_config_keys in defaults/main.yml
Andrew Schoen [Wed, 30 Nov 2016 22:47:51 +0000 (16:47 -0600)]
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>
8 years agotests: update the group_vars for docker_cluster
Andrew Schoen [Wed, 30 Nov 2016 21:21:12 +0000 (15:21 -0600)]
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>
8 years agoceph-rgw: no need to use playbook_dir when fetching configs for docker
Andrew Schoen [Wed, 30 Nov 2016 21:18:36 +0000 (15:18 -0600)]
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>
8 years agoceph-osd: no need to use playbook_dir when fetching configs for docker
Andrew Schoen [Wed, 30 Nov 2016 21:11:24 +0000 (15:11 -0600)]
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>
8 years agoceph-mon: no need to include playbook_dir when fetching configs
Andrew Schoen [Wed, 30 Nov 2016 21:08:42 +0000 (15:08 -0600)]
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>
8 years agoceph-mon: adds static: no to an include to avoid an ansible bug
Andrew Schoen [Wed, 30 Nov 2016 21:06:06 +0000 (15:06 -0600)]
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>
8 years agotests: adds a docker_cluster scenario
Andrew Schoen [Wed, 30 Nov 2016 18:20:07 +0000 (12:20 -0600)]
tests: adds a docker_cluster scenario

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: change the subnet on dmcrypt-journal-collocation
Andrew Schoen [Mon, 28 Nov 2016 21:43:51 +0000 (15:43 -0600)]
tests: change the subnet on dmcrypt-journal-collocation

It was currently set conflicting with dmcrypt-journal

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1139 from ceph/last-cleanup-apache
Sébastien Han [Thu, 1 Dec 2016 10:04:48 +0000 (11:04 +0100)]
Merge pull request #1139 from ceph/last-cleanup-apache

common: remove apache file

8 years agocommon: remove apache file 1139/head
Sébastien Han [Thu, 1 Dec 2016 10:02:31 +0000 (11:02 +0100)]
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>
8 years agoMerge pull request #1135 from guits/master
Sébastien Han [Wed, 30 Nov 2016 16:17:48 +0000 (17:17 +0100)]
Merge pull request #1135 from guits/master

Add gluster nfs ganesha repo only for Ubuntu

8 years agoAdd gluster nfs ganesha repo only for Ubuntu 1135/head
Guillaume Abrioux [Wed, 30 Nov 2016 15:30:43 +0000 (16:30 +0100)]
Add gluster nfs ganesha repo only for Ubuntu

According to the official documentation, adding PPA is not available for Debian.

8 years agoMerge pull request #1125 from guits/master
Sébastien Han [Wed, 30 Nov 2016 14:50:23 +0000 (15:50 +0100)]
Merge pull request #1125 from guits/master

Use 'package' module instead of yum, apt and dnf

8 years agoMerge pull request #1131 from guits/refact_code
Sébastien Han [Wed, 30 Nov 2016 14:46:15 +0000 (15:46 +0100)]
Merge pull request #1131 from guits/refact_code

Refact temporary vars in ceph-common defaults.

8 years agoRefact temporary vars in ceph-common defaults. 1131/head
Guillaume Abrioux [Tue, 29 Nov 2016 17:14:03 +0000 (18:14 +0100)]
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.

8 years agoMerge pull request #1132 from ktdreyer/no-ceph-extra
Andrew Schoen [Tue, 29 Nov 2016 22:21:51 +0000 (16:21 -0600)]
Merge pull request #1132 from ktdreyer/no-ceph-extra

rm ceph-extra.repo and redhat_distro_ceph_extra variable

8 years agorm ceph-extra.repo and redhat_distro_ceph_extra variable 1132/head
Ken Dreyer [Tue, 29 Nov 2016 20:02:58 +0000 (13:02 -0700)]
rm ceph-extra.repo and redhat_distro_ceph_extra variable

We removed the "apache" setting for "radosgw_frontend" in
adfdf6871e1172b542342064c13147789f39571a.

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.

8 years agoMerge pull request #1130 from ceph/colocated-tests
Andrew Schoen [Tue, 29 Nov 2016 21:40:25 +0000 (15:40 -0600)]
Merge pull request #1130 from ceph/colocated-tests

initial pass on tests for collocated journals

8 years agotests: use underscores to prevent tox combinatorial issues 1130/head
Alfredo Deza [Tue, 29 Nov 2016 20:01:31 +0000 (15:01 -0500)]
tests: use underscores to prevent tox combinatorial issues

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests

8 years agoUse 'package' module instead of yum, apt and dnf 1125/head
Guillaume Abrioux [Mon, 28 Nov 2016 14:16:56 +0000 (15:16 +0100)]
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)

8 years agotests: specify the devices for OSDs in the scenario for collocation
Alfredo Deza [Tue, 29 Nov 2016 15:05:49 +0000 (10:05 -0500)]
tests: specify the devices for OSDs in the scenario for collocation

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests

8 years agotests: create tests for collocated journals
Alfredo Deza [Tue, 29 Nov 2016 15:05:16 +0000 (10:05 -0500)]
tests: create tests for collocated journals

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: colocated#tests

8 years agocontrib: untrap before calling popd
Sébastien Han [Mon, 28 Nov 2016 22:22:49 +0000 (23:22 +0100)]
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>
8 years agoMerge pull request #1127 from ceph/osd-scenarios
Alfredo Deza [Mon, 28 Nov 2016 21:47:50 +0000 (16:47 -0500)]
Merge pull request #1127 from ceph/osd-scenarios

testing dmcrypt OSD scenarios

8 years agotests: change centos7-cluster to use raw_multi_journal 1127/head
Andrew Schoen [Mon, 28 Nov 2016 21:10:07 +0000 (15:10 -0600)]
tests: change centos7-cluster to use raw_multi_journal

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: change xenial-cluster to use raw_multi_journal
Andrew Schoen [Mon, 28 Nov 2016 21:05:48 +0000 (15:05 -0600)]
tests: change xenial-cluster to use raw_multi_journal

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotesting: change raw-multi-journal to journal-collocation
Andrew Schoen [Mon, 28 Nov 2016 21:02:16 +0000 (15:02 -0600)]
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>
8 years agotesting: rename the dmcrypt-dedicated-journal to dmcrypt-journal
Andrew Schoen [Mon, 28 Nov 2016 20:58:09 +0000 (14:58 -0600)]
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>
8 years agocontrib: don't fetch tags since we push force
Sébastien Han [Mon, 28 Nov 2016 18:07:52 +0000 (19:07 +0100)]
contrib: don't fetch tags since we push force

reverting 4be9c52bafdf4b55edde2aebce9607268a7871e3

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agotests: make Vagrantfile a symlink for dmcrypt scenarios
Andrew Schoen [Mon, 28 Nov 2016 18:06:25 +0000 (12:06 -0600)]
tests: make Vagrantfile a symlink for dmcrypt scenarios

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds a scenario using OSD dmcrypt_journal_collocation
Andrew Schoen [Mon, 28 Nov 2016 18:03:00 +0000 (12:03 -0600)]
tests: adds a scenario using OSD dmcrypt_journal_collocation

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds a dmcrypt-dedicated-journal testing scenario
Andrew Schoen [Mon, 28 Nov 2016 17:20:31 +0000 (11:20 -0600)]
tests: adds a dmcrypt-dedicated-journal testing scenario

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agocontrib: use push force because of the CI
Sébastien Han [Mon, 28 Nov 2016 17:54:14 +0000 (18:54 +0100)]
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>
8 years agotests: rename the centos7-mon-osd scenario to raw-multi-journal
Andrew Schoen [Mon, 28 Nov 2016 16:28:17 +0000 (10:28 -0600)]
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>
8 years agocontrib: do a fetch all so we don't push force
Sébastien Han [Mon, 28 Nov 2016 15:46:30 +0000 (16:46 +0100)]
contrib: do a fetch all so we don't push force

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1124 from ceph/galaxy
Sébastien Han [Mon, 28 Nov 2016 14:14:44 +0000 (15:14 +0100)]
Merge pull request #1124 from ceph/galaxy

contrib: It doesn't make sense to pull all tags

8 years agocontrib: It doesn't make sense to pull all tags 1124/head
Sébastien Han [Mon, 28 Nov 2016 14:12:40 +0000 (15:12 +0100)]
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>
8 years agoMerge pull request #1123 from ceph/galaxy
Sébastien Han [Mon, 28 Nov 2016 13:35:35 +0000 (14:35 +0100)]
Merge pull request #1123 from ceph/galaxy

contrib: add a goto basedir function

8 years agocontrib: add a goto basedir function 1123/head
Sébastien Han [Mon, 28 Nov 2016 13:27:28 +0000 (14:27 +0100)]
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>
8 years agoMerge pull request #1121 from D3N14L/master
Sébastien Han [Mon, 28 Nov 2016 09:26:15 +0000 (10:26 +0100)]
Merge pull request #1121 from D3N14L/master

Reviewed all roles and site.yml.sample and added "always_run: true" where appropriate

8 years agoBetter --check compatibility for ceph-rgw role 1121/head
Daniel Marks [Sun, 27 Nov 2016 13:27:28 +0000 (14:27 +0100)]
Better --check compatibility for ceph-rgw role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-restapi role
Daniel Marks [Sun, 27 Nov 2016 13:16:36 +0000 (14:16 +0100)]
Better --check compatibility for ceph-restapi role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-rbd-mirror role
Daniel Marks [Sat, 26 Nov 2016 21:21:42 +0000 (22:21 +0100)]
Better --check compatibility for ceph-rbd-mirror role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-osd role
Daniel Marks [Sat, 26 Nov 2016 21:16:07 +0000 (22:16 +0100)]
Better --check compatibility for ceph-osd role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-nfs role
Daniel Marks [Sat, 26 Nov 2016 20:31:56 +0000 (21:31 +0100)]
Better --check compatibility for ceph-nfs role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-mon role
Daniel Marks [Sat, 26 Nov 2016 20:05:32 +0000 (21:05 +0100)]
Better --check compatibility for ceph-mon role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-mds role
Daniel Marks [Sat, 26 Nov 2016 19:52:24 +0000 (20:52 +0100)]
Better --check compatibility for ceph-mds role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-fetch-keys role
Daniel Marks [Sat, 26 Nov 2016 19:42:08 +0000 (20:42 +0100)]
Better --check compatibility for ceph-fetch-keys role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-common role
Daniel Marks [Sat, 26 Nov 2016 19:39:12 +0000 (20:39 +0100)]
Better --check compatibility for ceph-common role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-common-coreos role
Daniel Marks [Sat, 26 Nov 2016 16:48:06 +0000 (17:48 +0100)]
Better --check compatibility for ceph-common-coreos role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-agent role
Daniel Marks [Sat, 26 Nov 2016 16:35:57 +0000 (17:35 +0100)]
Better --check compatibility for ceph-agent role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoMerge pull request #1102 from Logan2211/fix-default-syntax
Sébastien Han [Fri, 25 Nov 2016 15:07:34 +0000 (16:07 +0100)]
Merge pull request #1102 from Logan2211/fix-default-syntax

Fix jinja defaulting syntax

8 years agoMerge pull request #1118 from guits/master
Sébastien Han [Fri, 25 Nov 2016 10:21:51 +0000 (11:21 +0100)]
Merge pull request #1118 from guits/master

[shrink-mon]: force playbook to fail if there is only one mon

8 years ago[shrink-mon]: force playbook to fail if there is only one mon 1118/head
Guillaume Abrioux [Thu, 24 Nov 2016 21:46:46 +0000 (22:46 +0100)]
[shrink-mon]: force playbook to fail if there is only one mon

The playbook will fail if only 1 mon is in the cluster
and advise to use the `purge-cluster` playbook instead.

Fix #1083

8 years agoFix jinja defaulting syntax 1102/head
Logan V [Thu, 17 Nov 2016 17:10:01 +0000 (11:10 -0600)]
Fix jinja defaulting syntax

a397922 introduced a syntax error by attempting to default an unquoted
string, which causes execution failures on some ansible versions with:

Failed to template {{ ceph_rhcs_mount_path }}: Failed to template {{ ceph_stable_rh_storage_mount_path | default(/tmp/rh-storage-mount) }}: template error while templating string: unexpected '/'

8 years agoMerge pull request #1117 from D3N14L/master
Sébastien Han [Thu, 24 Nov 2016 15:43:15 +0000 (16:43 +0100)]
Merge pull request #1117 from D3N14L/master

Improve --check compatibility for ceph-common, ceph-mon and ceph-rgw roles

8 years agoMerge pull request #1113 from guits/master
Sébastien Han [Thu, 24 Nov 2016 14:19:29 +0000 (15:19 +0100)]
Merge pull request #1113 from guits/master

All `include_vars` need to have `*.yml`, `*.yaml` or `*.json` extension.

8 years agoAll `include_vars` need to have `*.yml`, `*.yaml` or `*.json` extension. 1113/head
Guillaume Abrioux [Wed, 23 Nov 2016 10:14:32 +0000 (11:14 +0100)]
All `include_vars` need to have `*.yml`, `*.yaml` or `*.json` extension.

As introduced in the following PR:
- https://github.com/ansible/ansible/pull/17207
we need to refactor our code.

8 years agoBetter --check compatibility for ceph-rgw role 1117/head
Daniel Marks [Thu, 24 Nov 2016 10:54:43 +0000 (11:54 +0100)]
Better --check compatibility for ceph-rgw role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-mon role
Daniel Marks [Thu, 24 Nov 2016 10:54:10 +0000 (11:54 +0100)]
Better --check compatibility for ceph-mon role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agoBetter --check compatibility for ceph-common role
Daniel Marks [Thu, 24 Nov 2016 10:53:29 +0000 (11:53 +0100)]
Better --check compatibility for ceph-common role

Carefully chosen "always_run: true" parameters for read-only tasks that
register variables. This enables --check runs (at least on deployed
clusters).

8 years agocontrib: add a new script to update remote repos
Sébastien Han [Mon, 21 Nov 2016 17:31:10 +0000 (18:31 +0100)]
contrib: add a new script to update remote repos

This script allows us to split ceph-ansible role directory into
repositories that can be pushed.
This script is an enhanced version of splitup.yml that was using git
subtree. I haven't found any straighforward way to push tag using git
subtree where git filter-branch seems easier and more practical.

Now we can not only push commits from master but also all the relative
tags. It is nice for projects that want to consume our roles from the
Ansible Galaxy, pointing to a specific tags looking for a particular
release.

For backward compatobility, I pushed a branch called
"master-history-bkp" on all the github.com/ceph/ansbible-ceph-*
repositories. So current projects using a SHA to retrieve the roles
won't be impacted by this change.

At the time of the commit, running this script took  104.60s to
complete.

Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Erwan Velu <erwan@redhat.com>
Co-Authored-By: Logan Vig <logan2211@gmail.com>
8 years agocontrib: add a new script to update remote repos
Sébastien Han [Mon, 21 Nov 2016 17:31:10 +0000 (18:31 +0100)]
contrib: add a new script to update remote repos

This script allows us to split ceph-ansible role directory into
repositories that can be pushed.
This script is an enhanced version of splitup.yml that was using git
subtree. I haven't found any straighforward way to push tag using git
subtree where git filter-branch seems easier and more practical.

Now we can not only push commits from master but also all the relative
tags. It is nice for projects that want to consume our roles from the
Ansible Galaxy, pointing to a specific tags looking for a particular
release.

For backward compatobility, I pushed a branch called
"master-history-bkp" on all the github.com/ceph/ansbible-ceph-*
repositories. So current projects using a SHA to retrieve the roles
won't be impacted by this change.

At the time of the commit, running this script took  104.60s to
complete.

Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Erwan Velu <erwan@redhat.com>
Co-Authored-By: Logan Vig <logan2211@gmail.com>
8 years agoMake NTP checks usable with '--check' 1115/head
Daniel Marks [Wed, 23 Nov 2016 12:52:34 +0000 (13:52 +0100)]
Make NTP checks usable with '--check'

As those task are only reading the installed packages and their output
is required in later tasks it is safe to run them also in check mode.

8 years agoMerge pull request #1112 from zhsj/fix-py3
Sébastien Han [Tue, 22 Nov 2016 17:07:09 +0000 (18:07 +0100)]
Merge pull request #1112 from zhsj/fix-py3

fix python3 compatibility in jinja2 template.

8 years agoMerge pull request #1101 from ceph/ci-testing
Alfredo Deza [Tue, 22 Nov 2016 16:41:05 +0000 (11:41 -0500)]
Merge pull request #1101 from ceph/ci-testing

testing: changes to allow for concurrent functional tests

8 years agoMerge pull request #1077 from font/rolling_update
Sébastien Han [Tue, 22 Nov 2016 15:56:46 +0000 (16:56 +0100)]
Merge pull request #1077 from font/rolling_update

Support containerized rolling update

8 years agoMerge pull request #1109 from ceph/bz-1396742
Sébastien Han [Tue, 22 Nov 2016 15:10:17 +0000 (16:10 +0100)]
Merge pull request #1109 from ceph/bz-1396742

rolling_update: clarify "serial" usage

8 years agofix python3 compatibility in jinja2 template. 1112/head
Shengjing Zhu [Tue, 22 Nov 2016 13:52:52 +0000 (21:52 +0800)]
fix python3 compatibility in jinja2 template.

rename iterkeys to keys

8 years agotesting: each scenario should use it's own fetch_directory 1101/head
Andrew Schoen [Mon, 21 Nov 2016 23:08:39 +0000 (17:08 -0600)]
testing: each scenario should use it's own fetch_directory

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agorolling_update: clarify "serial" usage 1109/head
Sébastien Han [Mon, 21 Nov 2016 10:29:05 +0000 (11:29 +0100)]
rolling_update: clarify "serial" usage

Prior to this commit the serial variable was poorly documented. Now we
are making clear that this value should be left untouched as the rolling
update mechanism should happen serially.

Solves: bz-1396742
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1104 from ktdreyer/rm-apache
Sébastien Han [Mon, 21 Nov 2016 10:13:19 +0000 (11:13 +0100)]
Merge pull request #1104 from ktdreyer/rm-apache

remove apache support for RGW

8 years agotesting: remove the timeout for the ansible-playbook call
Andrew Schoen [Fri, 18 Nov 2016 19:21:29 +0000 (13:21 -0600)]
testing: remove the timeout for the ansible-playbook call

This isn't available on OSX and we'll end up hitting this timeout when
we don't want to, let's just remove it.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: update the subnet in the ceph.conf tests
Andrew Schoen [Fri, 18 Nov 2016 19:19:03 +0000 (13:19 -0600)]
tests: update the subnet in the ceph.conf tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: add a UUID to the disk name when using libvirt
Andrew Schoen [Fri, 18 Nov 2016 17:09:20 +0000 (11:09 -0600)]
tests: add a UUID to the disk name when using libvirt

This will allow each testing scenario to have a unique names
for it's disks so there will not be conflicts when running tests
in parallel.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoremove apache support for RGW 1104/head ktdreyer/rm-apache
Ken Dreyer [Thu, 17 Nov 2016 22:43:31 +0000 (15:43 -0700)]
remove apache support for RGW

libfcgi is dead upstream (http://tracker.ceph.com/issues/16784)

The RGW developers intend to remove libfcgi support entirely before the
Luminous release.

Since libfcgi gets little-to-no developer attention or testing, remove
it entirely from ceph-ansible.

8 years agotests: fix monitor_address in ubuntu/16.04/mon/hosts
Andrew Schoen [Fri, 18 Nov 2016 17:02:47 +0000 (11:02 -0600)]
tests: fix monitor_address in ubuntu/16.04/mon/hosts

We changed the subnet in vagrant_variables.yml so this needs to change
here as well.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotesting: use the same sequence in the group_vars for every test scenario
Alfredo Deza [Fri, 18 Nov 2016 16:47:38 +0000 (11:47 -0500)]
testing: use the same sequence in the group_vars for every test scenario

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agotesting: use a sequence in the subnets for every vagrant_variables.yml to avoid colli...
Alfredo Deza [Fri, 18 Nov 2016 16:47:06 +0000 (11:47 -0500)]
testing: use a sequence in the subnets for every vagrant_variables.yml to avoid collisions

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agotesting: vagranfile should use random hostnames to prevent collisions
Alfredo Deza [Fri, 18 Nov 2016 16:44:09 +0000 (11:44 -0500)]
testing: vagranfile should use random hostnames to prevent collisions

Signed-off-by: Alfredo Deza <adeza@redhat.com>