Commit Graph

2702 Commits (249598ff4b0a88795c1b6f0b7b8d586061e7e678)
 

Author SHA1 Message Date
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
Andrew Schoen a87b2a2636 Merge pull request #1515 from ceph/mgr-key
mon: do not create mgr key on jewel
2017-05-12 12:02:53 -05:00
Alfredo Deza b04d18988e ceph-common: improve error message on restart osd daemon script
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-05-12 11:37:38 -04:00
Sébastien Han f1651cea9b 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>
2017-05-12 17:22:24 +02:00
Sébastien Han 0a51552f55 Merge pull request #1507 from ceph/rpm-strip-coreos
rpm: do not package coreos-related files
2017-05-11 22:54:01 +02:00
Sébastien Han 9422ab4039 Merge pull request #1511 from ceph/rm-ansible-install
ceph-aio-no-vagrant.sh: check if ansible is installed
2017-05-11 22:50:27 +02:00
David Galloway 196fa7ef39 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>
2017-05-11 16:19:11 -04:00
Andrew Schoen bd3ae1daa9 Merge pull request #1510 from ktdreyer/ansible-2.2.3
tox: bump ansible version to 2.2.3
2017-05-11 06:13:20 -05:00
Florian Klink 10b91661ce 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>
2017-05-11 11:17:10 +02:00
Sébastien Han 0e931d2bce 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>
2017-05-11 08:59:52 +02:00
Andrew Schoen d8c9e133d4 Merge pull request #1508 from ceph/wip-rgw-conf-var-move
rgw: move default bucket quota conf vars to global
2017-05-10 15:23:01 -05:00
Sébastien Han a22ae5a467 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>
2017-05-10 20:00:13 +02:00
Ken Dreyer e2300d5b1d 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
2017-05-10 11:38:51 -06:00
Ken Dreyer 94be99d158 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.
2017-05-10 11:08:33 -06:00
Ali Maredia 2aeb3a4957 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>
2017-05-10 13:06:48 -04:00
Andrew Schoen 18ede1694d Merge pull request #1505 from ceph/remove-install-ansible-script
remove the install-ansible.sh script
2017-05-10 11:20:52 -05:00
Andrew Schoen 1dc0fab21c 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>
2017-05-10 11:16:47 -05:00
Sébastien Han 31267ab48a Merge pull request #1460 from albertomurillo/clearlinux
Add clearlinux to supported platforms
2017-05-09 18:15:55 -04:00
Andrew Schoen f228943eb9 Merge pull request #1504 from ceph/docker-osd-typo
ceph-osd: fix typo in containerized OSD systemd unit
2017-05-08 19:18:53 -05:00
Andrew Schoen b38b69b603 ceph-osd: fix typo in containerized OSD systemd unit
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-08 15:30:45 -05:00
Andrew Schoen 2a4b3c190f Merge pull request #1502 from ceph/update-test-stable-release
tests: update default of CEPH_STABLE_RELEASE to kraken
2017-05-05 19:27:37 -05:00
Andrew Schoen 52d9fbd3d0 tests: update default of CEPH_STABLE_RELEASE to kraken
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-05 15:51:54 -05:00