Commit Graph

2470 Commits (a8c75c3bc9bd7211483f54cd98a99c95f69e7958)
 

Author SHA1 Message Date
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 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
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
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
Andrew Schoen 0b9c6cdc9c Merge pull request #1484 from ceph/wip-rgw-testing
rgw: test functionality of conf vars and pool creation for tuning
2017-05-05 10:56:00 -05:00
Andrew Schoen 3fad6b7b7c Merge pull request #1501 from ceph/try-jewel-xenial-container
tests: use the xenial container for jewel instead of centos7
2017-05-05 10:36:47 -05:00
Andrew Schoen cf037b5473 tests: use the xenial container for jewel instead of centos7
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-05 09:18:11 -05:00
Ali Maredia 734a07f0b9 rgw: test functionality of conf vars and pool creation for tuning
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-05-05 10:03:53 -04:00
Andrew Schoen b7b63fe52b Merge pull request #1499 from ceph/fix_1494
Common: Do not install ceph-mgr packages on jewel
2017-05-04 17:49:53 -05:00
Andrew Schoen ba5c40d45d tests: all tests must use the node fixture
Otherwise the logic we have for skipping tests does not work.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-04 16:37:28 -05:00
Andrew Schoen 949310c19e tests: do not test mgr nodes on jewel
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-04 15:35:04 -05:00
Guillaume Abrioux 48bd807508 Common: Do not install ceph-mgr packages on jewel
ceph-mgr tasks has to be skipped on jewel.

Fix: #1494

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-05-04 18:38:59 +02:00
Andrew Schoen 5b24de6529 Merge pull request #1492 from ceph/add-luminous
ceph-common: add luminous to ceph_release_num
2017-05-03 13:58:06 -05:00
Sébastien Han ba1c134b56 Merge pull request #1468 from ceph/logging
ansible: add logging path
2017-05-03 11:52:37 -04:00
Andrew Schoen 471cdb0c39 ceph-common: add luminous to ceph_release_num
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-03 09:11:52 -05:00
Andrew Schoen 4f4940dd9b Merge pull request #1482 from ceph/remove-debian-ceph-packages
ceph-common: remove debian_ceph_packages
2017-05-03 08:55:23 -05:00
Andrew Schoen 0af9fee45e Merge pull request #1490 from ceph/insecure-registry
tests: allow for insecure docker registries when testing rhcs
2017-05-02 20:16:49 -05:00
Andrew Schoen 2fada9bd6b tests: allow for insecure docker registries when testing rhcs
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-02 16:21:48 -05:00
Andrew Schoen 4ee280e2c4 Merge pull request #1487 from ceph/docker-jewel-tests
tests: actually test jewel when we say we are
2017-05-02 15:13:21 -05:00
Andrew Schoen 8472472194 docs: update tox docs to reflect the removed environment variables
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-02 14:15:42 -05:00
Andrew Schoen e384b24987 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>
2017-05-02 13:08:49 -05:00
Andrew Schoen 1fcc3283d8 tests: actually test a jewel container for the jewel-* docker tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-01 14:08:55 -05:00
Andrew Schoen 05743e1a7e Merge pull request #1485 from ceph/docker-osd-tests
tests: test all docker osds are up and in
2017-05-01 14:05:57 -05:00
Andrew Schoen 10d39e98dd tests: test that all docker OSDs are up and in
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-01 11:40:44 -05:00
Andrew Schoen 06b36fddf9 tests: adds a way to mark docker only tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-05-01 10:45:03 -05:00
Andrew Schoen 598fe0cada ceph-common: remove debian_ceph_packages
We shouldn't need this anymore as the upgrade bug that
debian_ceph_packages was used to workaround should have
been fixed as of jewel.

See https://github.com/ceph/ceph-ansible/issues/1481 for more
detailed information.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-28 10:51:51 -05:00
Sébastien Han d8387cf82c Merge pull request #1477 from ceph/quick_fix
Common: Fix condition on osd restart handler
2017-04-27 14:37:32 +02:00
Guillaume Abrioux b61deacfc0 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 16:24:21 +02:00
Sébastien Han b93ffe637b Merge pull request #1476 from WingkaiHo/improve-shrink-osd.yml
improve shrink-osd.yml can shrink osd when disk damage
2017-04-27 11:01:27 +02:00
WingkaiHo 0b9f322ca0 improve shrink-osd.yml can shrink osd when disk damage 2017-04-27 10:26:26 +08:00
Andrew Schoen acfa18df71 Merge pull request #1458 from ceph/wip-rgw-tuning
rgw: set tuning parameters
2017-04-25 17:12:15 -05:00
Ali Maredia 5192e3cd6d 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:01:03 -04:00
Alfredo Deza 78b680d35c Merge pull request #1464 from ceph/purge-ceph-target
purge-cluster: remove unneeded tasks
2017-04-25 14:12:49 -04:00
Andrew Schoen 5a3f95dfc1 purge-cluster: check for any running ceph process after purge
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-25 09:30:22 -05:00
Sébastien Han 6a69fa9495 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>
2017-04-25 10:10:09 +02:00