Commit Graph

2408 Commits (29b0c846f1bf7e866622805aca16ee330090dce1)
 

Author SHA1 Message Date
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
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 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
Andrew Schoen 881c384123 Merge pull request #1467 from ceph/backport_restart_daemons
Common: Restore check_socket
2017-04-25 07:27:15 -05:00
Guillaume Abrioux 11f0296744 Common: Restore check_socket
Restore the check_socket that was removed by `5bec62b`.
This commit also improves the logging in `restart_*_daemon.sh` scripts

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-04-24 19:04:57 +02:00
Andrew Schoen 4c32f96bca Merge pull request #1450 from ceph/backport-1439
Backport: 'tests: fix ceph_rhcs setup #1439'
2017-04-17 09:38:55 -05:00
Andrew Schoen 85da786a9d Merge pull request #1451 from ceph/doc-static-dirs
Doc static dirs
2017-04-13 15:25:47 -05:00
Alfredo Deza 743d648054 docs: force an empty _templates dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 66a9817e56)
(cherry picked from commit df315fef89)
2017-04-13 16:23:05 -04:00
Alfredo Deza 5cc31ced71 docs: force an empty _static dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aacbbf0efe)
(cherry picked from commit d26ed99dcc)
2017-04-13 16:22:58 -04:00
Andrew Schoen 9d2ed07ede tests: print contents of group_vars/all after modification
This is just nice to see in the test output so we know exactly what
configuration is going to be used.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 0e6d89b9db)
2017-04-13 14:56:00 -05:00
Andrew Schoen 7112253f4f ceph-common: is ceph_rchs is True do not include install_on_redhat.yml
That task includes logic for upstream installs that we do not want to
run when deploying RHCS.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 37d38b122b)
2017-04-13 14:55:46 -05:00
Andrew Schoen b6f12fab3e tests: set needed config in group_vars/all for rhcs testing
Instead of relying on environment variables and --extra-vars simply
modify the group_vars/all that ships with the specific testing scenario
to enable ceph_rchs testing.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 386afbec83)

Conflicts:
	tests/functional/rhcs_setup.yml
2017-04-13 14:55:28 -05:00
Andrew Schoen 672bc9b1b3 tests: remove CEPH_STABLE environment variable
I'm removing this because when we use an 'rhcs' scenario then we attempt
to set CEPH_STABLE=false as an environment variable. The issue with that
is because the value is coming from an environment variable it is always
treated as a string and ansible treats that as a boolean True. I plan to
set the ceph_stable value with our rhcs_setup.yml playbook instead of
relying on ---extra-vars and environment variables.

Related ansible issue: https://github.com/ansible/ansible/issues/17193

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 63983fa0b7)
2017-04-13 14:54:23 -05:00
Sébastien Han 186a392656 Merge pull request #1425 from ceph/bump-kraken
common: bump ceph version to kraken
2017-04-10 19:03:39 +02:00
Sébastien Han e48c31c671 common: bump ceph version to kraken
Kraken has been out for a couple of weeks now and the CI can test both
Kraken and Jewel.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-04-10 18:05:19 +02:00
Sébastien Han d113cf854c Merge pull request #1377 from ceph/ceph-mgr
mgr: add new role for ceph-mgr
2017-04-10 17:50:24 +02:00
Sébastien Han 61a8b26d59 test: add mgr bootstrap support
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-04-10 15:13:13 +02:00
Sébastien Han 12b2aa2e55 docker: fix monitors name
Prior to this change we were deploying a monitor using tis fqdn name but
we were checking its state and performing actions on it using its
shortname.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-04-10 15:13:12 +02:00
Sébastien Han 2aa5286544 mgr: add new role for ceph-mgr
The Ceph Manager daemon (ceph-mgr) runs alongside monitor daemons, to
provide additional monitoring and interfaces to external monitoring and
management systems.

Only works as of the Kraken release.

Co-Authored-By: Guillaume Abrioux <gabrioux@redhat.com>
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-04-10 15:13:09 +02:00
Alfredo Deza 67d83586f3 Merge pull request #1421 from ceph/tox-docs
tox-driven docs
2017-04-10 07:56:40 -04:00
Sébastien Han 7170669daf Merge pull request #1422 from k0ste/newfeature
ceph-common: persist "disable_transparent_hugepage"
2017-04-10 11:07:39 +02:00