Commit Graph

2823 Commits (3dd47a45cb709c65d0d759a5e7cef7657fddcec2)
 

Author SHA1 Message Date
Sébastien Han 410f513b08 Merge pull request #1568 from ceph/bz-1455187
purge-docker-cluster fix and test
2017-05-31 16:53:35 +02:00
Andrew Schoen f7677e4393 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>
2017-05-31 09:03:44 -05:00
mh 64b7b88fb7 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).
2017-05-30 18:28:39 +02:00
Andrew Schoen ecdb6f4967 tests: adds a scenario for purging containerized clusters
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-25 08:41:36 -05:00
Andrew Schoen 8e322d4825 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>
2017-05-25 07:30:25 -05:00
Guillaume Abrioux ddfe019342 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>
2017-05-24 15:55:41 +02:00
Guillaume Abrioux f0adecf482 Clean osds.yml.sample
Remove duplicate lines in osds.yml default vars file.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-24 15:55:41 +02:00
Sébastien Han 215ca26942 Merge pull request #1555 from ceph/rol-docker
rolling-update: set/unset flags on the right container
2017-05-24 15:24:06 +02:00
Andrew Schoen 2326c5ac63 Merge pull request #1557 from ceph/install-condition
common: fix installation condition
2017-05-24 06:39:36 -05:00
Sébastien Han aae4dd4aa9 Merge pull request #1563 from ceph/wip-libvirt
Use host-passthrough for libvirt vCPUs
2017-05-24 12:13:18 +02:00
Sébastien Han f75d36ce18 Merge pull request #1564 from arodd/master
Fixing partition detection regex for FusionIO devices.
2017-05-24 12:07:40 +02:00
Sébastien Han 468dc06bcd 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>
2017-05-24 11:52:22 +02:00
Austin Workman 22033bd1bf Fixing partition detection regex for FusionIO devices. 2017-05-23 14:39:39 -05:00
Zack Cerza 0b7744db27 Use host-passthrough for libvirt vCPUs
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-05-23 12:55:29 -06:00
Sébastien Han f7e9585a2c 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>
2017-05-23 11:50:58 +02:00
Sébastien Han 90389864d8 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>
2017-05-22 09:38:08 +02:00
Andrew Schoen e605445da3 Merge pull request #1552 from ceph/rhel
common: explicitly set rhel os version support
2017-05-19 10:23:02 -05:00
Sébastien Han 8ad503b248 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>
2017-05-19 10:38:20 +02:00
Sébastien Han fa168e9b69 Merge pull request #1529 from ktdreyer/readme-backporting
README: add backporting instructions
2017-05-19 09:17:36 +02:00
Ken Dreyer 4b2609d558 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.
2017-05-18 11:08:41 -06:00
Sébastien Han 99a11e216f Merge pull request #1551 from ceph/revert-1531-wip-1495
Revert "docker: Retry OSD disk prepare to workaround race condition"
2017-05-18 16:06:58 +02:00
Sébastien Han 6bdadc4363 Revert "docker: Retry OSD disk prepare to workaround race condition" 2017-05-18 16:03:16 +02:00
Sébastien Han e189d7caa6 backport_to_stable_branch: fix redirection
2> to redirect stderr not 2&>

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-18 14:48:14 +02:00
Sébastien Han d0fa3930fc Merge pull request #1548 from ceph/container-ipv6
mon: do not hardcode ipv4
2017-05-18 14:42:10 +02:00
Sébastien Han c7aae7f965 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>
2017-05-18 11:56:55 +02:00
Sébastien Han add0bd92aa Merge pull request #1532 from ceph/bpk-script
contrib: add backport script
2017-05-18 10:40:14 +02:00
Sébastien Han 33d7347988 contrib: add backport script
To ease the backport, I wrote a quick script.

Usage: ./backport.sh.sh stable-2.2
6892670d31 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>
2017-05-18 10:36:35 +02:00
David Galloway ee94730e33 Merge pull request #1546 from ceph/testinfra-version
tests: pin testinfra to 1.6.0
2017-05-17 16:51:03 -04:00
Andrew Schoen 7c5bda3d63 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>
2017-05-17 15:22:45 -05:00
Andrew Schoen 58618aa778 Merge pull request #1531 from ceph/wip-1495
docker: Retry OSD disk prepare to workaround race condition
2017-05-17 09:36:07 -05:00
Sébastien Han 1da3a3106f Merge pull request #1513 from flokli/monitor_interface
monitor_interface: document need to use monitor_address when using IPv6
2017-05-17 15:12:38 +02:00
Sébastien Han a118510b4f Merge pull request #1528 from ceph/control-path
Control path
2017-05-17 15:12:01 +02:00
Sébastien Han 4555f3c04a Merge pull request #1527 from ceph/piwi3910-master
added support for Sandisk FusionIO devices
2017-05-17 15:11:32 +02:00
Sébastien Han cf25ebb17c Merge pull request #1500 from yanyixing/master
ignore error when key is not exist
2017-05-17 15:04:20 +02:00
Andrew Schoen 15d4f65baa Merge pull request #1526 from ceph/wip-rgw-default-quota-set-testing
test: check if default bucket object quota is applied
2017-05-17 07:11:33 -05:00
Guillaume Abrioux 1e7010de7f 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>
2017-05-17 10:10:49 +02:00
Ali Maredia db19984010 test: check if default bucket object quota is applied
Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-05-16 17:12:27 -04:00
Sébastien Han ece9c14a33 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>
2017-05-16 14:42:39 +02:00
Sébastien Han 9f2c21972d 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>
2017-05-16 14:39:03 +02:00
Pascal Watteel e4ef8bb87f added support for Sandisk FusionIO devices
Signed-off-by: Pascal Watteel <pascal.watteel@emc.com>
2017-05-16 12:00:21 +02:00
Andrew Schoen 6892670d31 Merge pull request #1522 from ceph/rhcs-jewel
tests: rhcs should set ceph_stable_release to jewel
2017-05-15 15:44:07 -05:00
Andrew Schoen d0dd321294 Merge pull request #1516 from ceph/docker-registry
generate_group_vars_sample: merge role variables
2017-05-15 13:33:03 -05:00
Andrew Schoen 8756c553cc 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>
2017-05-15 09:54:01 -05:00
Sébastien Han 6a7be55b11 Merge pull request #1512 from ceph/ansible-ssh-control-path
ansible: shorten default control_path
2017-05-15 16:24:10 +02:00
Sébastien Han a80f07704c group_vars: resync all.yml.sample with ceph-docker-common
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-15 15:53:50 +02:00
Sébastien Han a8c75c3bc9 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>
2017-05-15 15:53:47 +02:00
Sébastien Han 53be0980be 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>
2017-05-15 15:52:58 +02:00
Sébastien Han 7fddcad8ea 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>
2017-05-15 15:52:58 +02:00
Sébastien Han 2106745343 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>
2017-05-15 15:52:57 +02:00
Sébastien Han 213d8acedf Merge pull request #1518 from ceph/pgs-error-message
ceph-common: improve error message on restart osd daemon script
2017-05-15 13:58:35 +02:00