Commit Graph

2426 Commits (92e96fe7dd1baef0957c069553a3aa40fa0bb748)
 

Author SHA1 Message Date
Andrew Schoen 92e96fe7dd ceph-common: add luminous to ceph_release_num
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 471cdb0c39)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-18 15:11:16 +02:00
Sébastien Han 4ce7220339 Merge pull request #1542 from ceph/monitor_interface-bkp
backport: monitor_interface: document need to use monitor_address when using IPv6
2017-05-18 11:13:38 +02:00
Sébastien Han 73f5ec1471 Merge pull request #1538 from ceph/quick_fix-bkp
backport: ignore error when doesn't exist
2017-05-18 11:13:13 +02:00
Sébastien Han 1fcd678ec0 Merge pull request #1541 from ceph/control-path-bkp
backport: Control path bkp
2017-05-18 11:05:34 +02:00
Sébastien Han ae6ed3514c Merge branch 'stable-2.2' into control-path-bkp 2017-05-18 11:05:12 +02:00
Sébastien Han e2a6983895 Merge pull request #1537 from ceph/ansible-ssh-control-path-bkp
backport: ansible: shorten default control_path
2017-05-18 11:04:08 +02:00
Andrew Schoen 08929d6cb9 Merge pull request #1539 from ceph/docker-registry-bkp
backport: Docker registry bkp
2017-05-17 15:51:18 -05:00
Sébastien Han aa08b6206a Merge pull request #1521 from ceph/bpk-1512
backport: ansible: shorten default control_path
2017-05-17 18:07:30 +02:00
Florian Klink 98915a9114 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>
(cherry picked from commit 10b91661ce)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:47:57 +02:00
Sébastien Han 4128c463b6 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>
(cherry picked from commit ece9c14a33)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:43:43 +02:00
Sébastien Han 29b0c846f1 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>
(cherry picked from commit 9f2c21972d)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:43:39 +02:00
Sébastien Han b25c029c31 group_vars: resync all.yml.sample with ceph-docker-common
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit a80f07704c)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han fde39cc8be 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>
(cherry picked from commit a8c75c3bc9)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han e5a61cf97e 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>
(cherry picked from commit 53be0980be)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han 932496d8de 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>
(cherry picked from commit 7fddcad8ea)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
Sébastien Han 90cf33cb6f 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>
(cherry picked from commit 2106745343)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:37:24 +02:00
yanyx ff2bdaacf3 ignore error when key is not exist
(cherry picked from commit 027f9aaf09)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:34:07 +02:00
Sébastien Han 828124450e 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>
(cherry picked from commit 0e931d2bce)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-17 15:28:32 +02:00
Andrew Schoen 78545adab5 Merge pull request #1530 from ceph/wip-rgw-testing-stable-2.2
rgw testing stable 2.2
2017-05-17 07:15:03 -05:00
Andrew Schoen 8df280e28a Merge pull request #1523 from ceph/backport-pg-message
ceph-common: improve error message on restart osd daemon script
2017-05-16 20:56:11 -05:00
Ali Maredia 97f34d0ac9 test: check if default bucket object quota is applied
Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit db19984010)
2017-05-16 17:19:46 -04:00
Ali Maredia 2e29579012 rgw: test functionality of conf vars and pool creation for tuning
Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 734a07f0b9)
2017-05-16 13:25:16 -04:00
Alfredo Deza 714186c55a ceph-common: improve error message on restart osd daemon script
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b04d18988e)
2017-05-15 12:44:49 -04:00
Andrew Schoen b8fe977105 Merge pull request #1509 from ceph/wip-stable-rgw-conf-var-move
rgw: move default bucket quota conf vars to global
2017-05-15 10:42:18 -05:00
Sébastien Han 2cd7a33727 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>
(cherry picked from commit 0e931d2bce)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-15 16:33:40 +02:00
Sébastien Han 4b6518259b ansible: add logging path
Ability to log ansible plays in a log file. Default location is
/var/log/ansible.log
Be sure the user running Ansible has permissions on the logfile.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1445065

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 6a69fa9495)
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-05-15 16:27:25 +02:00
Ali Maredia f685bd873f 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>
(cherry picked from commit 2aeb3a4957)
2017-05-10 13:14:11 -04:00
Sébastien Han a18d8b4935 Merge pull request #1506 from ceph/backport-1505
backport: "remove the install-ansible.sh script #1505"
2017-05-10 18:27:51 +02:00
Andrew Schoen 3eab676c04 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>
(cherry picked from commit 1dc0fab21c)
2017-05-10 11:22:07 -05:00
Andrew Schoen 89b3c62519 Merge pull request #1491 from ceph/backport-1490
backport: "tests: allow for insecure docker registries when testing rhcs #1490"
2017-05-02 20:24:06 -05:00
Andrew Schoen 6139ce12b2 tests: allow for insecure docker registries when testing rhcs
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 2fada9bd6b)

Conflicts:
	tests/functional/rhcs_setup.yml
2017-05-02 20:21:02 -05:00
Andrew Schoen 053654d1da Merge pull request #1489 from ceph/backport-1487
Backport: "tests: actually test jewel when we say we are #1487"
2017-05-02 20:16:01 -05:00
Andrew Schoen 7cfe44c393 tests: switch to using key/value extra-vars instead of json
I continue to have issues with extra-vars as json. The latest issue
being that the ceph_docker_image_tag config option included in the json
was being ignored. I can't find the root cause, by using the key/value
format seems to work.

I've also removed several options here to simply the interface. We can
add those back if they become necessary.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit e384b24987)
2017-05-02 15:14:42 -05:00
Andrew Schoen e4f55d5487 tests: actually test a jewel container for the jewel-* docker tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 1fcc3283d8)
2017-05-02 15:14:31 -05:00
Andrew Schoen 6e2a837f20 Merge pull request #1488 from ceph/backport-1427
tests: enable the rhcs-7-extras-nightly repo on test nodes
2017-05-01 15:29:06 -05:00
Andrew Schoen 87ea5490af tests: enable the rhcs-7-extras-nightly repo on test nodes
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 35aab1274a)
2017-05-01 15:21:28 -05:00
Andrew Schoen 8b73fdcec5 Merge pull request #1486 from ceph/backport-1485
Backport: "tests: test all docker osds are up and in #1485"
2017-05-01 15:17:37 -05:00
Andrew Schoen 2f439762f8 tests: test that all docker OSDs are up and in
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 10d39e98dd)
2017-05-01 12:50:04 -05:00
Andrew Schoen 30c4f6a13e tests: adds a way to mark docker only tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 06b36fddf9)
2017-05-01 12:49:48 -05:00
Andrew Schoen 2eb098ea5f Merge pull request #1478 from ceph/backport_1477
Backport: Common: Fix condition on osd restart handler
2017-04-27 10:32:26 -05:00
Guillaume Abrioux f3ba4acc24 Common: Fix condition on osd restart handler
Fix the condition on the osd restart handler.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-04-27 14:51:20 +02:00
Andrew Schoen 3fc6884841 Merge pull request #1474 from ceph/wip-2.2-rgw-tuning
rgw: set tuning parameters
2017-04-25 17:12:52 -05:00
Ali Maredia 16108f5d23 rgw: set tuning parameters
Change civetweb_num_thread default to 100

Add capability to override number of pgs for
rgw pools.

Add ceph.conf vars to enable default bucket
object quota at users choosing into the ceph.conf.j2
template

Resolves: rhbz#1437173
Resolves: rhbz#1391500

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-04-25 16:22:36 -04:00
Andrew Schoen 5b5e0b607a Merge pull request #1473 from ceph/backport-1464
backport: "purge-cluster: remove unneeded tasks #1464"
2017-04-25 14:24:12 -05:00
Andrew Schoen ea91e7f8a8 purge-cluster: check for any running ceph process after purge
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 5a3f95dfc1)
2017-04-25 13:09:02 -05:00
Andrew Schoen c692f5dbe1 purge-cluster: we don't support sysv or upstart anymore
Now that ceph-ansible only supports > jewel we don't need
to bother with sysv or upstart

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 26bdd59f5d)
2017-04-25 13:08:51 -05:00
Andrew Schoen c55f1efd95 purge-cluster: do not need to check for running ceph processes
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 7ca2bddcce)
2017-04-25 13:08:40 -05:00
Andrew Schoen f6f2cc4e1b purge-cluster: no need to remove ceph.target
The package uninstalls will stop ceph.target

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit aac79df3b3)
2017-04-25 13:08:27 -05:00
Andrew Schoen f83fcab075 Merge pull request #1470 from ceph/backport-1466
backport-1466: mon: upgrade calamari when running rolling_update playbook
2017-04-25 13:03:30 -05:00
Sébastien Han 4285baf787 mon: upgrade calamari when running rolling_update playbook
Prior to this change, ansible was only checking for the existence of the
package, now if upgrade_ceph_packages is true this means we are
performing an upgrade.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1442016

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 84d96be197)
2017-04-25 17:33:51 +02:00