Commit Graph

1366 Commits (e5eeea35565e8f76c7fb3aa0d273f95db7a6c1bf)
 

Author SHA1 Message Date
Alfredo Deza 441d83fe77 if ceph-disk fails to activate an OSD then bubble up the error
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-11 15:29:29 -04:00
James Saint-Rossy 3f9bd5c1b7 Removed infernalis workaround because ceph_stable_releases now includes it by default 2016-04-09 17:21:36 -04:00
James Saint-Rossy 4e7b93d725 Rebasing fork to account for upstream commits 2016-04-09 14:40:00 -04:00
Leseb 8959ab1843 Merge pull request #701 from ceph/conf-fixes
look at monitor_interface in hostvars when choosing interface or address
2016-04-08 22:00:32 +02:00
Andrew Schoen 5031234d66 look at monitor_interface in hostvars when choosing interface or address
This fixes a bug where monitor_interface might be set in your inventory
file and not by using group_vars or --extra-vars causing the template to
use the default address of 0.0.0.0 instead of the defined
monitor_interface.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-04-08 14:23:12 -05:00
Chris St. Pierre 1efe62252c Deduplicate RBD client directory creation
Instead of creating the RBD client socket path three different places
in three different ways, this creates it once. Ceph on OpenStack users
have the option to customize the permissions of the RBD client
directories.

Fixes #687
2016-04-08 13:50:00 -05:00
Ben England 5c0d7fc937 rebased 2016-04-08 13:01:11 -04:00
Leseb 7a5d4ce4e0 Merge pull request #700 from ceph/fix-readme-rbdmirror
rbd-mirror: fix readme title
2016-04-08 12:32:30 +02:00
Sébastien Han fc044e0571 rbd-mirror: fix readme title
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-08 12:32:05 +02:00
Leseb 686d81819f Merge pull request #699 from ceph/contrib-rbdmirror
contrib: update with ceph-rbd-mirror
2016-04-08 12:31:11 +02:00
Sébastien Han c78f5d7340 contrib: update with ceph-rbd-mirror
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-08 12:30:14 +02:00
Leseb 13343147ce Merge pull request #698 from ceph/rbdmirror-license
ceph-rbd-mirorr: add license file
2016-04-08 12:18:35 +02:00
Sébastien Han 6bcb451b9c ceph-rbd-mirorr: add license file
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-08 12:17:46 +02:00
Leseb f783adcc9e Merge pull request #678 from ceph/rbd-mirror
ceph-rbd-mirror: add new role
2016-04-08 12:12:30 +02:00
Sébastien Han 2d21f741f5 ceph-rbd-mirror: add new role
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-08 12:12:15 +02:00
Leseb aad93b4ba5 Merge pull request #697 from fultonj/rolling_update_sysvinit
sysvinit changes to rolling update playbook
2016-04-08 11:33:17 +02:00
John Fulton da797aaae1 This update has the following changes for the rolling update playbook.
1. Change how sysvinit ceph is determined to be enabled

For mons, the playbook checks if sysvinit is enabled by trying to
stat /var/lib/ceph/mon/ceph-{{ ansible_hostname }}/sysvinit [1].
However, that file is not created when a monitor is configured to
use sysvinit, instead, Ansible's service module is used [2]. Ansible
2.0 can verify if a service is enabled and does this by checking for
a glob, in this context it would be '/etc/rc?.d/S??ceph' [3]. Because
Ansible 1.9 does not support this feature, this change updates
rolling_update.yml by checking if sysvinit is enabled by having stat
glob for the same pattern and following the symlink. This is done only
for the mons.

2. Change how sysvinit ceph is restarted

The playbook passes the argument "mon" to the sysv init script
but, the init script does not necessarily take that argument and
it failed when tested on a RHEL7 system. However, dropping the
argument and just using Ansible's service module for state=restarted
worked so this change does not have this line for when
monsysvinit.stat.exists. A similar change is in this pull request
for the OSD restart (removing args=osd).

A second ceph mon restart command is run regardless of any conditions
being met. I am not sure why the service is restarted in the case of
upstart or sysvinit and then restarted again. I am going to assume
there is a subtle reason for this and not touch this second run but I
added a condition so that when ansible_os_family is Red Hat, then mon
is not passed as an argument, otherwise it is restarted as was already
in place.

[1] https://github.com/ceph/ceph-ansible/blob/v1.0.3/rolling_update.yml#L32-L33
[2] https://github.com/ceph/ceph-ansible/blob/v1.0.3/roles/ceph-mon/tasks/start_monitor.yml#L42-L45
[3] https://github.com/ansible/ansible-modules-core/blob/stable-2.0/system/service.py#L492-L493
2016-04-07 23:55:15 -04:00
Ben England 8d03b40e5d more robust, simpler, idempotent 2016-04-06 15:58:17 -04:00
Leseb 0047e83dad Merge pull request #684 from bengland2/when-hammer-try2
fix when clauses for installation of ceph RPM
2016-04-06 19:38:05 +02:00
Ben England ee9093d570 Sebastien's suggestion - add infernalis to list of releases with no separate ceph-mon or ceph-osd 2016-04-06 13:14:24 -04:00
Leseb b79e7287cc Merge pull request #685 from bengland2/create-sysconfig-ceph
create /etc/sysconfig/ceph if it doesn't already exist
2016-04-06 13:21:00 +02:00
Leseb 6f79c6f5b3 Merge pull request #683 from stpierre/fix-config-template-docker
Fix mis-use of config_template in docker tasks
2016-04-06 13:15:47 +02:00
Ben England dc2fc3665e create /etc/sysconfig/ceph if it doesn't already exist 2016-04-05 21:33:05 -04:00
Ben England b199bdcfab fix when clauses for installation of ceph RPM 2016-04-05 21:11:37 -04:00
Chris St. Pierre 1a73d55bae Fix mis-use of config_template in docker tasks
As written, generating the config file for ceph-mon in Docker yielded:

ERROR: config_template is not a legal parameter in an Ansible task or
handler

This fixes that error condition.
2016-04-05 12:09:09 -05:00
Leseb 0bf9a02676 Merge pull request #682 from ceph/change-pool-min-size
ceph-common: let ceph handle pool_default_min_size
2016-04-05 17:03:25 +02:00
Sébastien Han a8df31cb14 ceph-common: let ceph handle pool_default_min_size
We now set the value to 0, which means no specific default; ceph will
use size-size/2

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-05 17:01:49 +02:00
Leseb bca73c1ef1 Merge pull request #681 from ceph/change-pool-default-size
Change pool default size
2016-04-05 16:26:17 +02:00
Sébastien Han 2b7da0058b vagrant use pool_default_size to 2
For dev envs it is easir to use a replica count of 2 instead of 3.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-05 16:24:21 +02:00
Sébastien Han 84e57724e3 ceph-common: change the pool_default_size to 3
3 has been the default since Firefly I believe so we should stick with
this value.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-05 16:22:29 +02:00
James Saint-Rossy b55df73061 Cleanup is_ceph_infernalis logic 2016-04-04 18:19:49 -04:00
Leseb 62e17b2611 Merge pull request #679 from ceph/local-ansible
misc: add a script for vm test env
2016-04-04 17:10:26 +02:00
Sébastien Han 31811721e3 misc: add a script for vm test env
Vagrant will not always be available everywhere, sometimes we want to
bootstrap a ceph on a virtual machine. This script will help you
bootstrapping a ceph cluster from a development branch only.

So you can run it like this: ./ceph-aio-no-vagrant.sh v10.1.0
To get the v10.1.0 version installed. If the first argument ($1) is
empty then master will be used in consequence.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-04 17:09:46 +02:00
Leseb 79defd65b5 Merge pull request #677 from ceph/fix-key-perms
ceph-mon: fix ceph keys permissions
2016-04-04 10:55:32 +02:00
Sébastien Han 2700552186 ceph-mon: fix ceph keys permissions
Certain daemons will not start because of the wrong permissions.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-04 00:36:59 +02:00
Sébastien Han 4b93fc9dbd ceph-osd: docker fix typo again...
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-01 17:33:11 +02:00
Leseb e5dfd6d34b Merge pull request #675 from ceph/fix-typo-docker-osd
ceph-osd: docker start typo...
2016-04-01 17:32:08 +02:00
Sébastien Han fbf36716c5 ceph-osd: docker start typo...
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-01 17:31:34 +02:00
Leseb d4d8642221 Merge pull request #673 from ceph/docker-perm
ceph-docker: fix permissions on directories
2016-04-01 15:44:47 +02:00
Sébastien Han 00819ab7b8 ceph-docker: osd fix container prep and start
We now check if the device has already been prepared, if we detect a
ceph partition we do not prepare the device.
Also fixed some issues while running on Atomic or CoreOS.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-01 15:40:19 +02:00
Sébastien Han df6c3f4f72 ceph-docker: fix permissions on directories
fixing the can't open /var/lib/ceph/bootstrap-osd/ceph.keyring: can't
open /var/lib/ceph/bootstrap-osd/ceph.keyring: (13) Permission denied

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-01 14:43:33 +02:00
Leseb bc2cfc83d5 Merge pull request #666 from PiotrProkop/ceph-mon-fix
Adding support for non atomic and non CoreOS machines for deploying containerized mons with kv backend
2016-04-01 13:16:32 +02:00
Leseb 9f2556315f Merge pull request #665 from PiotrProkop/ceph-osd-kv
Adding support for non atomic and non CoreOS machines for deploying containerized osds with kv backend
2016-04-01 13:16:22 +02:00
pprokop da9b772534 Changed when statements due to review 2016-04-01 13:02:02 +02:00
pprokop 604ea77ecc Changes due to review 2016-04-01 12:57:58 +02:00
Leseb 9123c854ae Merge pull request #671 from squizzi/fix-admin-key-wait
Added when: cephx to prevent waiting on keyring with cephx: false
2016-04-01 11:11:43 +02:00
Kyle Squizzato 9d10db21c2 Added when: cephx to prevent waiting on keyring with cephx: false
Signed-off-by: Kyle Squizzato <ksquizz@gmail.com>
2016-03-31 23:30:36 -04:00
Leseb a4caacdc2b Merge pull request #669 from ceph/fix-atomic
ceph-mon: docker fix run on atomic host
2016-04-01 00:36:55 +02:00
Leseb 88764c2b68 Merge pull request #668 from cloudnull/config_template_ansible2_compat
Update the config_template plugin for ansible2
2016-03-31 17:49:40 +02:00
Sébastien Han 6c5ac63ecc ceph-mon: docker fix run on atomic host
fix template issues.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-03-31 16:41:28 +02:00