Commit Graph

5441 Commits (bc570619b6dce7263077982c0fb31300b0b2eb75)
 

Author SHA1 Message Date
Leseb 9174ea2c6a Merge pull request #715 from rootfs/jewel
some fixes to run containers on Atomic
2016-04-15 10:55:42 +02:00
Huamin Chen 9d81f32538 set path to find mon and osd systemd unit file templates
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-04-14 21:57:27 +00:00
Huamin Chen 1d3b3c63b8 fix deployment on Atomic
Signed-off-by: Huamin Chen <hchen@redhat.com>
2016-04-14 13:41:05 +00:00
Leseb f51548580f Merge pull request #713 from stpierre/fix-rbd-client-dirs
Fix creation of RBD client directories
2016-04-13 22:25:59 +02:00
Leseb f772fe8f60 Merge pull request #712 from ceph/monitor-interface-not-defined
Check to see if hostvars[host]['monitor_interface'] is defined
2016-04-13 22:19:33 +02:00
Chris St. Pierre de22ae0a06 Fix creation of RBD client directories
Need to use a template, not a bare variable name.
2016-04-13 15:10:44 -05:00
Andrew Schoen a2b8ef8c1d Check to see if hostvars[host]['monitor_interface'] is defined
This fixes https://github.com/ceph/ceph-ansible/issues/711

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-04-13 13:34:51 -05:00
Leseb de0caaecf8 Merge pull request #707 from cloudnull/ct_updates
Update the config_template plugin
2016-04-13 18:52:56 +02:00
James Saint-Rossy fc270bb772 fixed handling of new ceph_version 2016-04-12 21:26:59 -04:00
James Saint-Rossy ee1e470757 moved string parsing of ceph version into ansbile for better error handling 2016-04-12 21:08:42 -04:00
Leseb 107ecc0fa8 Merge pull request #710 from bengland2/limit-autodiscover-check
purge-cluster - fix osd_auto_discovery check
2016-04-12 17:01:04 +02:00
Ben England 4d70b3621f devices var is defined in context of osds role 2016-04-12 09:49:44 -04:00
Leseb 0e619691da Merge pull request #705 from ceph/no-agent-role-test
remove agent role, no packages for it upstream yet
2016-04-12 14:05:33 +02:00
Alfredo Deza be752b595c remove rbd-mirror as well from testing. No packages are available yet
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-12 07:38:13 -04:00
Alfredo Deza 8df3029d47 remove coreos from default testing as well
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-12 07:17:35 -04:00
Leseb afad22c5a1 Merge pull request #708 from ceph/docker-img
docker: do not hardcode image and user name
2016-04-12 12:08:35 +02:00
Leseb 25ec82a755 Merge pull request #706 from fultonj/patch-1
Balance tags on <your_host
2016-04-12 12:07:45 +02:00
Leseb 34da863bfe Merge pull request #703 from ceph/issue-670
if ceph-disk fails to activate an OSD then bubble up the error
2016-04-12 12:05:28 +02:00
Leseb d756ee325f Merge pull request #688 from bengland2/safer-disk-zap
low-priority - more robust, simpler, idempotent purge-cluster.yml
2016-04-12 12:04:39 +02:00
Leseb 74e3e04dcd Merge pull request #696 from stpierre/dedup-rbd-client-dirs
Deduplicate RBD client directory creation
2016-04-12 12:03:56 +02:00
Sébastien Han 7424ad6d68 docker: do not hardcode image and user name
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-12 12:01:53 +02:00
Kevin Carter b56b224250
Update the config_template plugin
These changes address 2 issues:

* The config template plugin in v1 mode was not respecting a list
  of integers and would cause a stacktrace because the ConfigParese
  module expects everything written to be a string.
* The config template plugin in v2 mode was not properly handingly
  the multi-string-op type due to an oversight in the ``_option_write``
  method.

With these updates the config template is now able to better support
all of the potential options that could be thrown at it when writing
an INI config file.

Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2016-04-11 23:28:40 -05:00
John Fulton 68460cf384 Balance tags on <your_host
Third of occurrence of <your_host> didn't have a closing tag. This is a tiny change to add the he missing '>'. 

This will let people quickly update this file with sed. For example: `sed s/\<your_host\>/192.168.1.41/g -i cluster-maintenance.yml`.
2016-04-11 22:25:53 -04:00
Ben England 8de1c32bb6 this is how ceph-disk partition really looks 2016-04-11 16:53:45 -04:00
Alfredo Deza 3d671cef22 remove agent role, no packages for it upstream yet
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-11 15:48:29 -04:00
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