]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agoBluestore: Omit "osd mkfs type" etc from ceph.conf 1607/head
Peter Jenkins [Wed, 14 Jun 2017 07:44:13 +0000 (10:44 +0300)]
Bluestore: Omit "osd mkfs type" etc from ceph.conf

Remove "osd mkfs type" and the other pre-Bluestore parameters from the
generated ceph.conf so that disk activation on OSDs will work. The
current default xfs config results in a failed deployment and
incorrect partition metadata.

8 years agoMerge pull request #1599 from ceph/bz-1458024
Sébastien Han [Tue, 13 Jun 2017 16:00:06 +0000 (18:00 +0200)]
Merge pull request #1599 from ceph/bz-1458024

tests: adds a test for rolling updates of containerized clusters

8 years agoMerge pull request #1598 from ceph/test-rbd-pool
Andrew Schoen [Tue, 13 Jun 2017 15:04:57 +0000 (10:04 -0500)]
Merge pull request #1598 from ceph/test-rbd-pool

ceph-mon: fix get rbd size hanging

8 years agorolling_update: set health_mon_check_delay to 15 1599/head
Andrew Schoen [Mon, 12 Jun 2017 21:07:52 +0000 (16:07 -0500)]
rolling_update: set health_mon_check_delay to 15

The old value of 10 did not give enough time for a containerized mon to
pass the health check.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: add PG config to the docker_cluster scenario
Andrew Schoen [Wed, 7 Jun 2017 13:30:17 +0000 (08:30 -0500)]
tests: add PG config to the docker_cluster scenario

This is so we'll pass the PG check when performing a rolling update.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds *-update_docker_cluster testing scenarios
Andrew Schoen [Tue, 6 Jun 2017 14:43:14 +0000 (09:43 -0500)]
tests: adds *-update_docker_cluster testing scenarios

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1604 from ceph/rewrite_pgs_clean_tasks
Sébastien Han [Tue, 13 Jun 2017 11:41:42 +0000 (13:41 +0200)]
Merge pull request #1604 from ceph/rewrite_pgs_clean_tasks

rewrite check pgs clean tasks

8 years agorewrite check pgs clean tasks 1604/head
Guillaume Abrioux [Tue, 13 Jun 2017 07:37:13 +0000 (09:37 +0200)]
rewrite check pgs clean tasks

Avoid screen scrapping by rewriting `waiting for clean pgs` tasks like it is
done in 304de48.

Use the json output returned by `ceph -s` instead

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1573 from duritong/master-control_path-port
Sébastien Han [Mon, 12 Jun 2017 13:05:11 +0000 (15:05 +0200)]
Merge pull request #1573 from duritong/master-control_path-port

keep port as part of the control path

8 years agoceph-mon: fix get rbd size hanging 1598/head
Sébastien Han [Mon, 12 Jun 2017 12:38:10 +0000 (14:38 +0200)]
ceph-mon: fix get rbd size hanging

For newly created cluster the command: ceph --cluster {{ cluster }} osd
pool get rbd size does not respond properly.
We only want to check if the rbd pool exists, so we know use an ls |
grep approach.

Closes: https://github.com/ceph/ceph-ansible/issues/1547
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1584 from ceph/rewrite_check_pgs
Alfredo Deza [Mon, 12 Jun 2017 11:52:29 +0000 (07:52 -0400)]
Merge pull request #1584 from ceph/rewrite_check_pgs

Common: Rewrite check_pgs

8 years agoCommon: Rewrite check_pgs 1584/head
Guillaume Abrioux [Mon, 5 Jun 2017 09:21:32 +0000 (11:21 +0200)]
Common: Rewrite check_pgs

Rewrite the check_pgs by using json parsing instead of complex regexp to
parse the `ceph -s` output.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1590 from ceph/fix_ceph_docker_on_openstack
Andrew Schoen [Wed, 7 Jun 2017 13:50:21 +0000 (08:50 -0500)]
Merge pull request #1590 from ceph/fix_ceph_docker_on_openstack

Common: Add a default for ceph_docker_on_openstack

8 years agoMerge pull request #1589 from ceph/bz-1454945
Andrew Schoen [Tue, 6 Jun 2017 15:17:44 +0000 (10:17 -0500)]
Merge pull request #1589 from ceph/bz-1454945

remove ceph-iscsi-gw play from site.yml.sample

8 years agoCommon: Add a default for ceph_docker_on_openstack 1590/head
Guillaume Abrioux [Tue, 6 Jun 2017 14:46:44 +0000 (16:46 +0200)]
Common: Add a default for ceph_docker_on_openstack

Add a default value for `ceph_docker_on_openstack` to avoid a
conditional check error for the task `pause after docker install before starting` in
`roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoremove ceph-iscsi-gw play from site.yml.sample 1589/head
Andrew Schoen [Tue, 6 Jun 2017 14:04:58 +0000 (09:04 -0500)]
remove ceph-iscsi-gw play from site.yml.sample

We ship ceph-iscsi-gw in a separate repo downstream and do not package
it with ceph-ansible. Including the play for ceph-iscsi-gw in
site.yml.sample makes the playbook fail when using the downstream
packages.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1454945
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1586 from ceph/rpm-strip-iscsi
Andrew Schoen [Mon, 5 Jun 2017 18:46:41 +0000 (13:46 -0500)]
Merge pull request #1586 from ceph/rpm-strip-iscsi

rpm: do not package iscsi files

8 years agoMerge pull request #1587 from ceph/bz-1451786
Gregory Meno [Mon, 5 Jun 2017 18:14:49 +0000 (11:14 -0700)]
Merge pull request #1587 from ceph/bz-1451786

ceph-mon: fix support for ipv6 on containerized mons

8 years agoceph-mon: fix support for ipv6 on containerized mons 1587/head
Andrew Schoen [Mon, 5 Jun 2017 15:51:47 +0000 (10:51 -0500)]
ceph-mon: fix support for ipv6 on containerized mons

The fact ['ansible_$interface']['ipv4'] is a dictionary where
['ansible_$interface']['ipv6'] is a list. If we use
ansible_default_ipv6|ipv4 is is always a dictionary which allows us to
get the ipv6 and ipv4 address without adding more complexity to the
template.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agorpm: do not package iscsi files 1586/head
Ken Dreyer [Mon, 5 Jun 2017 15:17:59 +0000 (09:17 -0600)]
rpm: do not package iscsi files

Currently we cannot install the ceph-iscsi-ansible RPM on a node where
the ceph-ansible RPM is already installed.

ceph-iscsi-ansible should install on top of the ceph-ansible environment
without issues.

8 years agoMerge pull request #1582 from ceph/purge-docker-fix
Andrew Schoen [Mon, 5 Jun 2017 14:31:53 +0000 (09:31 -0500)]
Merge pull request #1582 from ceph/purge-docker-fix

purge-docker-cluster: include ceph_docker_registry

8 years agopurge-docker-cluster: include ceph_docker_registry 1582/head
Andrew Schoen [Fri, 2 Jun 2017 12:42:34 +0000 (07:42 -0500)]
purge-docker-cluster: include ceph_docker_registry

We need to include ceph_docker_registry when removing containers/images
because if we don't it will assume docker.io which is not always where
the image originated from, causing the playbook to fail.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1469 from ceph/refact_code
Sébastien Han [Fri, 2 Jun 2017 10:40:25 +0000 (12:40 +0200)]
Merge pull request #1469 from ceph/refact_code

Docker: Refact code

8 years agoMerge pull request #1580 from ceph/fix_check_pgs
Sébastien Han [Fri, 2 Jun 2017 10:11:05 +0000 (12:11 +0200)]
Merge pull request #1580 from ceph/fix_check_pgs

Common: Improve check pgs

8 years agoCommon: Improve check pgs 1580/head
Guillaume Abrioux [Thu, 1 Jun 2017 12:46:13 +0000 (14:46 +0200)]
Common: Improve check pgs

For some reason we changed the check of pgs but it appears it could be
dangerous because the current check might satisfied as long as 1 PG is
active+clean.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1579 from ceph/fix_ceph-osd-run
Sébastien Han [Thu, 1 Jun 2017 14:22:45 +0000 (16:22 +0200)]
Merge pull request #1579 from ceph/fix_ceph-osd-run

Docker: Remove duplicate var passed to docker-run

8 years agoDocker: Remove duplicate var passed to docker-run 1579/head
Guillaume Abrioux [Thu, 1 Jun 2017 12:31:17 +0000 (14:31 +0200)]
Docker: Remove duplicate var passed to docker-run

since `-e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE` is already hardcoded in
`eph-osd-run.sh.j2` there is no need to add `-e
CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE` as a default value in defaults vars.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1577 from ceph/purge-tests
Andrew Schoen [Wed, 31 May 2017 20:18:14 +0000 (15:18 -0500)]
Merge pull request #1577 from ceph/purge-tests

tests: use docker playbook when redeploying a purged cluster

8 years agotests: use docker playbook when redeploying a purged cluster 1577/head
Andrew Schoen [Wed, 31 May 2017 16:53:37 +0000 (11:53 -0500)]
tests: use docker playbook when redeploying a purged cluster

When we purge a containerized cluster we need to use the correct
playbook when redploying the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1568 from ceph/bz-1455187
Sébastien Han [Wed, 31 May 2017 14:53:36 +0000 (16:53 +0200)]
Merge pull request #1568 from ceph/bz-1455187

purge-docker-cluster fix and test

8 years agopurge-docker-cluster: pip is only used on Debian 1568/head
Andrew Schoen [Tue, 30 May 2017 20:06:46 +0000 (15:06 -0500)]
purge-docker-cluster: pip is only used on Debian

We only need to purge packages installed by pip on Debian systems.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agokeep port as part of the control path 1573/head
mh [Tue, 30 May 2017 16:25:29 +0000 (18:25 +0200)]
keep port as part of the control path

On a Vagrant setup, every host is 127.0.0.1 and every user is vagrant.
To not have ansible do the same stuff on the same machine (the one
we connected first), we should keep the port as part of the
control path.

Also this helps in setups where different hosts might be hidden
behind the same IP, but on different ports (e.g. using DNAT).

8 years agotests: adds a scenario for purging containerized clusters
Andrew Schoen [Thu, 25 May 2017 12:50:37 +0000 (07:50 -0500)]
tests: adds a scenario for purging containerized clusters

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-docker-cluster: default raw_journal_devices to []
Andrew Schoen [Thu, 25 May 2017 12:30:25 +0000 (07:30 -0500)]
purge-docker-cluster: default raw_journal_devices to []

If we're purging a containerized cluster that did not use the
raw_multi_journal OSD scenario then raw_journal_devices will not be
defined which causes the playbook to fail.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1455187

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoRefact code 1469/head
Guillaume Abrioux [Wed, 12 Apr 2017 17:57:33 +0000 (19:57 +0200)]
Refact code

`ceph-docker-common`:
  At the moment there is a lot of duplicated tasks in each
  `./roles/ceph-<role>/tasks/docker/main.yml` that could be refactored in
  `./roles/ceph-docker-common/tasks/main.yml`.

`*_containerized_deployment` variables:
  All `*_containerized_deployment` have been refactored to a single
  variable `containerized_deployment`

duplicate `cephx` variables in `group_vars/* have been removed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoClean osds.yml.sample
Guillaume Abrioux [Wed, 24 May 2017 13:42:19 +0000 (15:42 +0200)]
Clean osds.yml.sample

Remove duplicate lines in osds.yml default vars file.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1555 from ceph/rol-docker
Sébastien Han [Wed, 24 May 2017 13:24:06 +0000 (15:24 +0200)]
Merge pull request #1555 from ceph/rol-docker

rolling-update: set/unset flags on the right container

8 years agoMerge pull request #1557 from ceph/install-condition
Andrew Schoen [Wed, 24 May 2017 11:39:36 +0000 (06:39 -0500)]
Merge pull request #1557 from ceph/install-condition

common: fix installation condition

8 years agoMerge pull request #1563 from ceph/wip-libvirt
Sébastien Han [Wed, 24 May 2017 10:13:18 +0000 (12:13 +0200)]
Merge pull request #1563 from ceph/wip-libvirt

Use host-passthrough for libvirt vCPUs

8 years agoMerge pull request #1564 from arodd/master
Sébastien Han [Wed, 24 May 2017 10:07:40 +0000 (12:07 +0200)]
Merge pull request #1564 from arodd/master

Fixing partition detection regex for FusionIO devices.

8 years agocommon: remove useless check 1557/head
Sébastien Han [Tue, 23 May 2017 10:02:24 +0000 (12:02 +0200)]
common: remove useless check

We only check for everything expect 'distro' because that
is a valid way of deploying RHCS, with preprepared repos
present on the nodes.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoFixing partition detection regex for FusionIO devices. 1564/head
Austin Workman [Tue, 23 May 2017 19:39:39 +0000 (14:39 -0500)]
Fixing partition detection regex for FusionIO devices.

8 years agoUse host-passthrough for libvirt vCPUs 1563/head
Zack Cerza [Tue, 23 May 2017 18:55:29 +0000 (12:55 -0600)]
Use host-passthrough for libvirt vCPUs

Signed-off-by: Zack Cerza <zack@redhat.com>
8 years agocommon: fix installation condition
Sébastien Han [Mon, 22 May 2017 12:18:45 +0000 (14:18 +0200)]
common: fix installation condition

Problem: we could end up in situation where we would install a package
on a machine that does not have the right repo enabled. Because the
condition was set to OR we weren't pinning a particular host but just a
condition. Let's say someone sets 'ceph_origin == "distro"', this would
try to install OSD packages on Monitors.

Solution: use a AND condition to first pin to the group_name (which
identifies a set of hosts) AND then after this one of the installation
condition.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1453119
Co-Authored-By: https://github.com/zhsj
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agorolling-update: set/unset flags on the right container 1555/head
Sébastien Han [Mon, 22 May 2017 07:38:08 +0000 (09:38 +0200)]
rolling-update: set/unset flags on the right container

Problem: we are delegating the set/unset flag to a monitor node but we
try to call an osd container

Solution: use the right container name.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1552 from ceph/rhel v2.3.0rc1
Andrew Schoen [Fri, 19 May 2017 15:23:02 +0000 (10:23 -0500)]
Merge pull request #1552 from ceph/rhel

common: explicitly set rhel os version support

8 years agocommon: explicitly set rhel os version support 1552/head
Sébastien Han [Fri, 19 May 2017 08:37:31 +0000 (10:37 +0200)]
common: explicitly set rhel os version support

Clarify in the error message that only RHEL version >= 7.3 are
supported.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452431
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1529 from ktdreyer/readme-backporting
Sébastien Han [Fri, 19 May 2017 07:17:36 +0000 (09:17 +0200)]
Merge pull request #1529 from ktdreyer/readme-backporting

README: add backporting instructions

8 years agoREADME: add backporting instructions 1529/head
Ken Dreyer [Tue, 16 May 2017 17:08:40 +0000 (11:08 -0600)]
README: add backporting instructions

Add instructions for how we maintain and release the stable release
series.

We'd been following this for a while, so let's get it written down.

8 years agoMerge pull request #1551 from ceph/revert-1531-wip-1495
Sébastien Han [Thu, 18 May 2017 14:06:58 +0000 (16:06 +0200)]
Merge pull request #1551 from ceph/revert-1531-wip-1495

Revert "docker: Retry OSD disk prepare to workaround race condition"

8 years agoRevert "docker: Retry OSD disk prepare to workaround race condition" 1551/head
Sébastien Han [Thu, 18 May 2017 14:03:16 +0000 (16:03 +0200)]
Revert "docker: Retry OSD disk prepare to workaround race condition"

8 years agobackport_to_stable_branch: fix redirection
Sébastien Han [Thu, 18 May 2017 12:48:14 +0000 (14:48 +0200)]
backport_to_stable_branch: fix redirection

2> to redirect stderr not 2&>

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1548 from ceph/container-ipv6
Sébastien Han [Thu, 18 May 2017 12:42:10 +0000 (14:42 +0200)]
Merge pull request #1548 from ceph/container-ipv6

mon: do not hardcode ipv4

8 years agomon: do not hardcode ipv4 1548/head
Sébastien Han [Thu, 18 May 2017 09:56:55 +0000 (11:56 +0200)]
mon: do not hardcode ipv4

Problem: fail to deploy a containerized Ceph cluster with ipv6
Solution: do not hardcode ipv4 when bootstrapping the container.

Now use ip_version: ipv6 to get a containerized cluster deployed with
ipv6.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451786
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1532 from ceph/bpk-script
Sébastien Han [Thu, 18 May 2017 08:40:14 +0000 (10:40 +0200)]
Merge pull request #1532 from ceph/bpk-script

contrib: add backport script

8 years agocontrib: add backport script 1532/head
Sébastien Han [Wed, 17 May 2017 09:36:06 +0000 (11:36 +0200)]
contrib: add backport script

To ease the backport, I wrote a quick script.

Usage: ./backport.sh.sh stable-2.2
6892670d317698771be7e96ce9032bc27d3fd1e5 my-work

We can also pass multiple commits.
Follow up on @ktdreyer write up here:
https://github.com/ceph/ceph-ansible/pull/1529

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1546 from ceph/testinfra-version
David Galloway [Wed, 17 May 2017 20:51:03 +0000 (16:51 -0400)]
Merge pull request #1546 from ceph/testinfra-version

tests: pin testinfra to 1.6.0

8 years agotests: pin testinfra to 1.6.0 1546/head
Andrew Schoen [Wed, 17 May 2017 20:22:45 +0000 (15:22 -0500)]
tests: pin testinfra to 1.6.0

1.6.1 fails with 'testinfra is in an unsupported or invalid wheel'

See: https://github.com/philpep/testinfra/issues/201

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1531 from ceph/wip-1495
Andrew Schoen [Wed, 17 May 2017 14:36:07 +0000 (09:36 -0500)]
Merge pull request #1531 from ceph/wip-1495

docker: Retry OSD disk prepare to workaround race condition

8 years agoMerge pull request #1513 from flokli/monitor_interface
Sébastien Han [Wed, 17 May 2017 13:12:38 +0000 (15:12 +0200)]
Merge pull request #1513 from flokli/monitor_interface

monitor_interface: document need to use monitor_address when using IPv6

8 years agoMerge pull request #1528 from ceph/control-path
Sébastien Han [Wed, 17 May 2017 13:12:01 +0000 (15:12 +0200)]
Merge pull request #1528 from ceph/control-path

Control path

8 years agoMerge pull request #1527 from ceph/piwi3910-master
Sébastien Han [Wed, 17 May 2017 13:11:32 +0000 (15:11 +0200)]
Merge pull request #1527 from ceph/piwi3910-master

added support for Sandisk FusionIO devices

8 years agoMerge pull request #1500 from yanyixing/master
Sébastien Han [Wed, 17 May 2017 13:04:20 +0000 (15:04 +0200)]
Merge pull request #1500 from yanyixing/master

ignore error when key is not exist

8 years agoMerge pull request #1526 from ceph/wip-rgw-default-quota-set-testing
Andrew Schoen [Wed, 17 May 2017 12:11:33 +0000 (07:11 -0500)]
Merge pull request #1526 from ceph/wip-rgw-default-quota-set-testing

test: check if default bucket object quota is applied

8 years agoDocker: rm container before retry of ceph osd prepare 1531/head
Guillaume Abrioux [Mon, 15 May 2017 09:50:23 +0000 (11:50 +0200)]
Docker: rm container before retry of ceph osd prepare

In addition to `196fa7e` this commit check if a container has been
already launched and delete it before retrying the ceph osd prepare
process.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agotest: check if default bucket object quota is applied 1526/head
Ali Maredia [Mon, 15 May 2017 18:01:57 +0000 (14:01 -0400)]
test: check if default bucket object quota is applied

Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
8 years agoansible: add a note in ansible.cfg 1528/head
Sébastien Han [Tue, 16 May 2017 12:42:39 +0000 (14:42 +0200)]
ansible: add a note in ansible.cfg

Comments inside this file must be set BEFORE the option. NOT after the
option, otherwise the comment will be interpreted as a value to that
option.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoansible: fix control path line
Sébastien Han [Tue, 16 May 2017 12:39:03 +0000 (14:39 +0200)]
ansible: fix control path line

If the comment is put after the line then it is interpreted so we need
to move it before and have a dedicated line.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoadded support for Sandisk FusionIO devices 1527/head
Pascal Watteel [Fri, 7 Apr 2017 14:59:00 +0000 (18:59 +0400)]
added support for Sandisk FusionIO devices

Signed-off-by: Pascal Watteel <pascal.watteel@emc.com>
8 years agoMerge pull request #1522 from ceph/rhcs-jewel
Andrew Schoen [Mon, 15 May 2017 20:44:07 +0000 (15:44 -0500)]
Merge pull request #1522 from ceph/rhcs-jewel

tests: rhcs should set ceph_stable_release to jewel

8 years agoMerge pull request #1516 from ceph/docker-registry
Andrew Schoen [Mon, 15 May 2017 18:33:03 +0000 (13:33 -0500)]
Merge pull request #1516 from ceph/docker-registry

generate_group_vars_sample: merge role variables

8 years agotests: rhcs should set ceph_stable_release to jewel 1522/head
Andrew Schoen [Mon, 15 May 2017 14:54:01 +0000 (09:54 -0500)]
tests: rhcs should set ceph_stable_release to jewel

rhcs is based off of jewel, so we need to set this var in the tests so
that the ceph-mgr role is skipped.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1512 from ceph/ansible-ssh-control-path
Sébastien Han [Mon, 15 May 2017 14:24:10 +0000 (16:24 +0200)]
Merge pull request #1512 from ceph/ansible-ssh-control-path

ansible: shorten default control_path

8 years agogroup_vars: resync all.yml.sample with ceph-docker-common 1516/head
Sébastien Han [Mon, 15 May 2017 13:51:49 +0000 (15:51 +0200)]
group_vars: resync all.yml.sample with ceph-docker-common

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agogenerate_group_vars_sample: ability to merge roles
Sébastien Han [Mon, 15 May 2017 13:49:45 +0000 (15:49 +0200)]
generate_group_vars_sample: ability to merge roles

Problem: the meta declaration just includes the role, it does nothing
with the group_vars. For ansible to use files defined in group_vars/ the
name of the file must match a host group. Like mons, osds, etc. There is
no group docker-common so the variables defined there are never used, as
proved by https://bugzilla.redhat.com/show_bug.cgi?id=1447179 and the
ansible documentation.

Solution: bring the ability to merge roles files. So now by default,
ceph-docker-common and ceph-common will go into all.yml.sample

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447179
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agogenerate_group_vars_sample: do not use expr
Sébastien Han [Mon, 15 May 2017 08:56:33 +0000 (10:56 +0200)]
generate_group_vars_sample: do not use expr

As mentionned in https://github.com/koalaman/shellcheck/wiki/SC2003
expr is antiquated.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agogenerate_group_vars_sample.sh: fix script indent
Sébastien Han [Mon, 15 May 2017 08:38:36 +0000 (10:38 +0200)]
generate_group_vars_sample.sh: fix script indent

Using indent of 2 on the entire script.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agorgw: resync group_vars
Sébastien Han [Mon, 15 May 2017 08:36:17 +0000 (10:36 +0200)]
rgw: resync group_vars

At some point, during a commit changing `roles/ceph-rgw/defaults/main.yml`
we forgot to run `generate_group_vars_sample.sh`.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1518 from ceph/pgs-error-message
Sébastien Han [Mon, 15 May 2017 11:58:35 +0000 (13:58 +0200)]
Merge pull request #1518 from ceph/pgs-error-message

ceph-common: improve error message on restart osd daemon script

8 years agoMerge pull request #1515 from ceph/mgr-key
Andrew Schoen [Fri, 12 May 2017 17:02:53 +0000 (12:02 -0500)]
Merge pull request #1515 from ceph/mgr-key

mon: do not create mgr key on jewel

8 years agoceph-common: improve error message on restart osd daemon script 1518/head
Alfredo Deza [Fri, 12 May 2017 15:01:03 +0000 (11:01 -0400)]
ceph-common: improve error message on restart osd daemon script

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agomon: do not create mgr key on jewel 1515/head
Sébastien Han [Thu, 11 May 2017 09:55:00 +0000 (11:55 +0200)]
mon: do not create mgr key on jewel

The CI on Docker is reporting the following error:

STDERR:
Error EINVAL: bad entity name

This is due to the fact that this auth entity name does not exist on
Jewel so we should not create that key when running Jewel containers.

Fixes: https://github.com/ceph/ceph-ansible/issues/1514
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1507 from ceph/rpm-strip-coreos
Sébastien Han [Thu, 11 May 2017 20:54:01 +0000 (22:54 +0200)]
Merge pull request #1507 from ceph/rpm-strip-coreos

rpm: do not package coreos-related files

8 years agoMerge pull request #1511 from ceph/rm-ansible-install
Sébastien Han [Thu, 11 May 2017 20:50:27 +0000 (22:50 +0200)]
Merge pull request #1511 from ceph/rm-ansible-install

ceph-aio-no-vagrant.sh: check if ansible is installed

8 years agodocker: Retry osd disk prep to workaround race condition
David Galloway [Thu, 11 May 2017 20:19:11 +0000 (16:19 -0400)]
docker: Retry osd disk prep to workaround race condition

Fixes: https://github.com/ceph/ceph-ansible/issues/1495
Signed-off-by: David Galloway <dgallowa@redhat.com>
8 years agoMerge pull request #1510 from ktdreyer/ansible-2.2.3
Andrew Schoen [Thu, 11 May 2017 11:13:20 +0000 (06:13 -0500)]
Merge pull request #1510 from ktdreyer/ansible-2.2.3

tox: bump ansible version to 2.2.3

8 years agomonitor_interface: document need to use monitor_address when using IPv6 1513/head
Florian Klink [Thu, 11 May 2017 09:15:28 +0000 (11:15 +0200)]
monitor_interface: document need to use monitor_address when using IPv6

Already documented in the Red Hat Ceph Storage 2 Installation Guide
for Red Hat Enterprise Linux, but not here

Signed-off-by: Florian Klink <flokli@flokli.de>
8 years agoansible: shorten default control_path 1512/head
Sébastien Han [Thu, 11 May 2017 06:57:53 +0000 (08:57 +0200)]
ansible: shorten default control_path

Default ansible control_path option is too long, so we shorten it by
changing the ansible.cfg file.

For more info see: https://github.com/ansible/ansible/issues/11536
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447569
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1508 from ceph/wip-rgw-conf-var-move
Andrew Schoen [Wed, 10 May 2017 20:23:01 +0000 (15:23 -0500)]
Merge pull request #1508 from ceph/wip-rgw-conf-var-move

rgw: move default bucket quota conf vars to global

8 years agoceph-aio-no-vagrant.sh: check if ansible is installed 1511/head
Sébastien Han [Wed, 10 May 2017 18:00:13 +0000 (20:00 +0200)]
ceph-aio-no-vagrant.sh: check if ansible is installed

Since we don't provide install-ansible.sh anymore we just check if it
exists. If not we fail and ask for installation.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agotox: bump ansible version to 2.2.3 1510/head
Ken Dreyer [Wed, 10 May 2017 17:10:13 +0000 (11:10 -0600)]
tox: bump ansible version to 2.2.3

The Ansible team has released v2.2.3, which fixes two CVEs:

CVE-2017-7481
CVE-2017-7466

https://www.ansible.com/security

8 years agorpm: do not package coreos-related files 1507/head
Ken Dreyer [Wed, 10 May 2017 17:08:33 +0000 (11:08 -0600)]
rpm: do not package coreos-related files

These are unnecessary on RPM-based platforms, and it makes it harder to
audit the RPM-packaged files for security when we ship things that are
unneeded.

8 years agorgw: move default bucket quota conf vars to global 1508/head
Ali Maredia [Wed, 10 May 2017 17:00:41 +0000 (13:00 -0400)]
rgw: move default bucket quota conf vars to global

"rgw override bucket index max shards" and
"rgw bucket default quota max objects" were in the
client section of the ceph.conf and not being
applied, this commit moves them to global

Resolves: bz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
8 years agoMerge pull request #1505 from ceph/remove-install-ansible-script
Andrew Schoen [Wed, 10 May 2017 16:20:52 +0000 (11:20 -0500)]
Merge pull request #1505 from ceph/remove-install-ansible-script

remove the install-ansible.sh script

8 years agoremove the install-ansible.sh script 1505/head
Andrew Schoen [Wed, 10 May 2017 16:16:47 +0000 (11:16 -0500)]
remove the install-ansible.sh script

I'm unsure why this is needed, users should be able to install ansible
on their own in the method they prefer.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1460 from albertomurillo/clearlinux
Sébastien Han [Tue, 9 May 2017 22:15:55 +0000 (18:15 -0400)]
Merge pull request #1460 from albertomurillo/clearlinux

Add clearlinux to supported platforms

8 years agoMerge pull request #1504 from ceph/docker-osd-typo
Andrew Schoen [Tue, 9 May 2017 00:18:53 +0000 (19:18 -0500)]
Merge pull request #1504 from ceph/docker-osd-typo

ceph-osd: fix typo in containerized OSD systemd unit

8 years agoceph-osd: fix typo in containerized OSD systemd unit 1504/head
Andrew Schoen [Mon, 8 May 2017 20:30:45 +0000 (15:30 -0500)]
ceph-osd: fix typo in containerized OSD systemd unit

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1502 from ceph/update-test-stable-release
Andrew Schoen [Sat, 6 May 2017 00:27:37 +0000 (19:27 -0500)]
Merge pull request #1502 from ceph/update-test-stable-release

tests: update default of CEPH_STABLE_RELEASE to kraken

8 years agotests: update default of CEPH_STABLE_RELEASE to kraken 1502/head
Andrew Schoen [Fri, 5 May 2017 20:51:54 +0000 (15:51 -0500)]
tests: update default of CEPH_STABLE_RELEASE to kraken

Signed-off-by: Andrew Schoen <aschoen@redhat.com>