]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agorgw: move default bucket quota conf vars to global 1508/head
Ali Maredia [Wed, 10 May 2017 17:00:41 +0000 (13:00 -0400)]
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>
8 years agoMerge pull request #1460 from albertomurillo/clearlinux
Sébastien Han [Tue, 9 May 2017 22:15:55 +0000 (18:15 -0400)]
Merge pull request #1460 from albertomurillo/clearlinux

Add clearlinux to supported platforms

8 years agoMerge pull request #1504 from ceph/docker-osd-typo
Andrew Schoen [Tue, 9 May 2017 00:18:53 +0000 (19:18 -0500)]
Merge pull request #1504 from ceph/docker-osd-typo

ceph-osd: fix typo in containerized OSD systemd unit

8 years agoceph-osd: fix typo in containerized OSD systemd unit 1504/head
Andrew Schoen [Mon, 8 May 2017 20:30:45 +0000 (15:30 -0500)]
ceph-osd: fix typo in containerized OSD systemd unit

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1502 from ceph/update-test-stable-release
Andrew Schoen [Sat, 6 May 2017 00:27:37 +0000 (19:27 -0500)]
Merge pull request #1502 from ceph/update-test-stable-release

tests: update default of CEPH_STABLE_RELEASE to kraken

8 years agotests: update default of CEPH_STABLE_RELEASE to kraken 1502/head
Andrew Schoen [Fri, 5 May 2017 20:51:54 +0000 (15:51 -0500)]
tests: update default of CEPH_STABLE_RELEASE to kraken

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1484 from ceph/wip-rgw-testing
Andrew Schoen [Fri, 5 May 2017 15:56:00 +0000 (10:56 -0500)]
Merge pull request #1484 from ceph/wip-rgw-testing

rgw: test functionality of conf vars and pool creation for tuning

8 years agoMerge pull request #1501 from ceph/try-jewel-xenial-container
Andrew Schoen [Fri, 5 May 2017 15:36:47 +0000 (10:36 -0500)]
Merge pull request #1501 from ceph/try-jewel-xenial-container

tests: use the xenial container for jewel instead of centos7

8 years agotests: use the xenial container for jewel instead of centos7 1501/head
Andrew Schoen [Fri, 5 May 2017 14:18:11 +0000 (09:18 -0500)]
tests: use the xenial container for jewel instead of centos7

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agorgw: test functionality of conf vars and pool creation for tuning 1484/head
Ali Maredia [Fri, 28 Apr 2017 19:47:21 +0000 (15:47 -0400)]
rgw: test functionality of conf vars and pool creation for tuning

Signed-off-by: Ali Maredia <amaredia@redhat.com>
8 years agoMerge pull request #1499 from ceph/fix_1494
Andrew Schoen [Thu, 4 May 2017 22:49:53 +0000 (17:49 -0500)]
Merge pull request #1499 from ceph/fix_1494

Common: Do not install ceph-mgr packages on jewel

8 years agotests: all tests must use the node fixture 1499/head
Andrew Schoen [Thu, 4 May 2017 21:36:36 +0000 (16:36 -0500)]
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>
8 years agotests: do not test mgr nodes on jewel
Andrew Schoen [Thu, 4 May 2017 19:04:23 +0000 (14:04 -0500)]
tests: do not test mgr nodes on jewel

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoCommon: Do not install ceph-mgr packages on jewel
Guillaume Abrioux [Thu, 4 May 2017 09:14:58 +0000 (11:14 +0200)]
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>
8 years agoMerge pull request #1492 from ceph/add-luminous
Andrew Schoen [Wed, 3 May 2017 18:58:06 +0000 (13:58 -0500)]
Merge pull request #1492 from ceph/add-luminous

ceph-common: add luminous to ceph_release_num

8 years agoMerge pull request #1468 from ceph/logging
Sébastien Han [Wed, 3 May 2017 15:52:37 +0000 (11:52 -0400)]
Merge pull request #1468 from ceph/logging

ansible: add logging path

8 years agoceph-common: add luminous to ceph_release_num 1492/head
Andrew Schoen [Wed, 3 May 2017 14:11:52 +0000 (09:11 -0500)]
ceph-common: add luminous to ceph_release_num

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1482 from ceph/remove-debian-ceph-packages
Andrew Schoen [Wed, 3 May 2017 13:55:23 +0000 (08:55 -0500)]
Merge pull request #1482 from ceph/remove-debian-ceph-packages

ceph-common: remove debian_ceph_packages

8 years agoMerge pull request #1490 from ceph/insecure-registry
Andrew Schoen [Wed, 3 May 2017 01:16:49 +0000 (20:16 -0500)]
Merge pull request #1490 from ceph/insecure-registry

tests: allow for insecure docker registries when testing rhcs

8 years agotests: allow for insecure docker registries when testing rhcs 1490/head
Andrew Schoen [Tue, 2 May 2017 20:49:50 +0000 (15:49 -0500)]
tests: allow for insecure docker registries when testing rhcs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1487 from ceph/docker-jewel-tests
Andrew Schoen [Tue, 2 May 2017 20:13:21 +0000 (15:13 -0500)]
Merge pull request #1487 from ceph/docker-jewel-tests

tests: actually test jewel when we say we are

8 years agodocs: update tox docs to reflect the removed environment variables 1487/head
Andrew Schoen [Tue, 2 May 2017 19:15:42 +0000 (14:15 -0500)]
docs: update tox docs to reflect the removed environment variables

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: switch to using key/value extra-vars instead of json
Andrew Schoen [Tue, 2 May 2017 16:15:23 +0000 (11:15 -0500)]
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>
8 years agotests: actually test a jewel container for the jewel-* docker tests
Andrew Schoen [Mon, 1 May 2017 19:08:55 +0000 (14:08 -0500)]
tests: actually test a jewel container for the jewel-* docker tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1485 from ceph/docker-osd-tests
Andrew Schoen [Mon, 1 May 2017 19:05:57 +0000 (14:05 -0500)]
Merge pull request #1485 from ceph/docker-osd-tests

tests: test all docker osds are up and in

8 years agotests: test that all docker OSDs are up and in 1485/head
Andrew Schoen [Mon, 1 May 2017 15:45:44 +0000 (10:45 -0500)]
tests: test that all docker OSDs are up and in

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds a way to mark docker only tests
Andrew Schoen [Mon, 1 May 2017 15:45:03 +0000 (10:45 -0500)]
tests: adds a way to mark docker only tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-common: remove debian_ceph_packages 1482/head
Andrew Schoen [Fri, 28 Apr 2017 15:47:27 +0000 (10:47 -0500)]
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>
8 years agoMerge pull request #1477 from ceph/quick_fix
Sébastien Han [Thu, 27 Apr 2017 12:37:32 +0000 (14:37 +0200)]
Merge pull request #1477 from ceph/quick_fix

Common: Fix condition on osd restart handler

8 years agoCommon: Fix condition on osd restart handler 1477/head
Guillaume Abrioux [Thu, 27 Apr 2017 14:24:21 +0000 (16:24 +0200)]
Common: Fix condition on osd restart handler

Fix the condition on the osd restart handler.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1476 from WingkaiHo/improve-shrink-osd.yml
Sébastien Han [Thu, 27 Apr 2017 09:01:27 +0000 (11:01 +0200)]
Merge pull request #1476 from WingkaiHo/improve-shrink-osd.yml

improve shrink-osd.yml can shrink osd when disk damage

8 years agoimprove shrink-osd.yml can shrink osd when disk damage 1476/head
WingkaiHo [Thu, 27 Apr 2017 02:26:26 +0000 (10:26 +0800)]
improve shrink-osd.yml can shrink osd when disk damage

8 years agoMerge pull request #1458 from ceph/wip-rgw-tuning
Andrew Schoen [Tue, 25 Apr 2017 22:12:15 +0000 (17:12 -0500)]
Merge pull request #1458 from ceph/wip-rgw-tuning

rgw: set tuning parameters

8 years agorgw: set tuning parameters 1458/head
Ali Maredia [Wed, 19 Apr 2017 16:30:40 +0000 (12:30 -0400)]
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>
8 years agoMerge pull request #1464 from ceph/purge-ceph-target
Alfredo Deza [Tue, 25 Apr 2017 18:12:49 +0000 (14:12 -0400)]
Merge pull request #1464 from ceph/purge-ceph-target

purge-cluster: remove unneeded tasks

8 years agopurge-cluster: check for any running ceph process after purge 1464/head
Andrew Schoen [Tue, 25 Apr 2017 12:35:13 +0000 (07:35 -0500)]
purge-cluster: check for any running ceph process after purge

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoansible: add logging path 1468/head
Sébastien Han [Tue, 25 Apr 2017 08:10:09 +0000 (10:10 +0200)]
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>
8 years agoMerge pull request #1466 from ceph/upgrade-calamari
Andrew Schoen [Mon, 24 Apr 2017 14:34:41 +0000 (07:34 -0700)]
Merge pull request #1466 from ceph/upgrade-calamari

mon: upgrade calamari when running rolling_update playbook

8 years agoAdd clearlinux to supported platforms 1460/head
Alberto Murillo [Fri, 22 Apr 2016 19:13:36 +0000 (14:13 -0500)]
Add clearlinux to supported platforms

Signed-off-by: Alberto Murillo Silva <alberto.murillo.silva@intel.com>
8 years agoMerge pull request #1455 from ceph/restart_daemons
Andrew Schoen [Mon, 24 Apr 2017 13:54:07 +0000 (06:54 -0700)]
Merge pull request #1455 from ceph/restart_daemons

Common: Restore check_socket

8 years agoCommon: Restore check_socket 1455/head
Guillaume Abrioux [Tue, 18 Apr 2017 10:40:43 +0000 (12:40 +0200)]
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>
8 years agomon: upgrade calamari when running rolling_update playbook 1466/head
Sébastien Han [Mon, 24 Apr 2017 09:04:06 +0000 (11:04 +0200)]
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>
8 years agoMerge pull request #1461 from ceph/wip-remove-osd-directory-scenario
Sébastien Han [Mon, 24 Apr 2017 08:54:54 +0000 (10:54 +0200)]
Merge pull request #1461 from ceph/wip-remove-osd-directory-scenario

remove osd directory scenario

8 years agoremove osd directory scenario 1461/head
Gregory Meno [Thu, 20 Apr 2017 23:47:06 +0000 (16:47 -0700)]
remove osd directory scenario

Proof-of-concept clusters or actual production clusters will never want to use this. We also do not test it anywhere for this same reason.

Signed-off-by: Gregory Meno <gmeno@redhat.com>
8 years agopurge-cluster: we don't support sysv or upstart anymore
Andrew Schoen [Fri, 21 Apr 2017 22:14:38 +0000 (15:14 -0700)]
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>
8 years agopurge-cluster: do not need to check for running ceph processes
Andrew Schoen [Fri, 21 Apr 2017 22:12:46 +0000 (15:12 -0700)]
purge-cluster: do not need to check for running ceph processes

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agopurge-cluster: no need to remove ceph.target
Andrew Schoen [Fri, 21 Apr 2017 22:11:03 +0000 (15:11 -0700)]
purge-cluster: no need to remove ceph.target

The package uninstalls will stop ceph.target

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1463 from ceph/mgr-rhcs
Alfredo Deza [Fri, 21 Apr 2017 19:48:13 +0000 (12:48 -0700)]
Merge pull request #1463 from ceph/mgr-rhcs

tests: mgr nodes should have the ceph-mon repo install

8 years agoMerge pull request #1459 from jcsp/wip-19713
Sébastien Han [Fri, 21 Apr 2017 18:34:46 +0000 (13:34 -0500)]
Merge pull request #1459 from jcsp/wip-19713

mon: update mgr key capabilities

8 years agotests: mgr nodes should have the ceph-mon repo install 1463/head
Andrew Schoen [Fri, 21 Apr 2017 17:45:33 +0000 (10:45 -0700)]
tests: mgr nodes should have the ceph-mon repo install

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agomon: update mgr key capabilities 1459/head
John Spray [Thu, 20 Apr 2017 14:17:45 +0000 (15:17 +0100)]
mon: update mgr key capabilities

This is to allow ceph-mgr daemons to remote control
osd and mds daemons with MCommand messages.

Fixes: http://tracker.ceph.com/issues/19713
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #1456 from netservers/master
Sébastien Han [Wed, 19 Apr 2017 19:25:41 +0000 (14:25 -0500)]
Merge pull request #1456 from netservers/master

Apparmor on Ubuntu Xenial will not permit containers to mount devices.

8 years agoApparmor on Ubuntu Xenial will not permit containers to mount devices, even with... 1456/head
John McEleney [Wed, 19 Apr 2017 09:12:04 +0000 (10:12 +0100)]
Apparmor on Ubuntu Xenial will not permit containers to mount devices, even with CAP SYS_ADMIN.

8 years agoMerge pull request #1453 from ceph/docs-fixtures
Andrew Schoen [Mon, 17 Apr 2017 20:46:02 +0000 (15:46 -0500)]
Merge pull request #1453 from ceph/docs-fixtures

[docs] fixtures and Python tests

8 years agoMerge pull request #1454 from ceph/tox-docs
Alfredo Deza [Mon, 17 Apr 2017 20:43:05 +0000 (16:43 -0400)]
Merge pull request #1454 from ceph/tox-docs

docs: write docs for tox.ini file

8 years agodocs: review feedback on testing/tox.rst 1454/head
Andrew Schoen [Mon, 17 Apr 2017 20:39:01 +0000 (15:39 -0500)]
docs: review feedback on testing/tox.rst

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: fix rst error in scenarios.rst
Andrew Schoen [Mon, 17 Apr 2017 20:15:33 +0000 (15:15 -0500)]
docs: fix rst error in scenarios.rst

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: write docs for tox.ini file
Andrew Schoen [Thu, 13 Apr 2017 19:50:43 +0000 (14:50 -0500)]
docs: write docs for tox.ini file

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agodocs: describe Python tests and fixtures 1453/head
Alfredo Deza [Mon, 17 Apr 2017 19:39:54 +0000 (15:39 -0400)]
docs: describe Python tests and fixtures

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agodocs: conventions for test layouts
Alfredo Deza [Mon, 17 Apr 2017 19:39:27 +0000 (15:39 -0400)]
docs: conventions for test layouts

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #1452 from ceph/rhcs-mgr
Andrew Schoen [Mon, 17 Apr 2017 18:27:53 +0000 (13:27 -0500)]
Merge pull request #1452 from ceph/rhcs-mgr

ceph-common: install ceph-mgr for rhcs

8 years agoceph-common: install ceph-mgr for rhcs on debian 1452/head
Andrew Schoen [Mon, 17 Apr 2017 13:40:24 +0000 (08:40 -0500)]
ceph-common: install ceph-mgr for rhcs on debian

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoceph-common: install ceph-mgr for rhcs on rhel
Andrew Schoen [Mon, 17 Apr 2017 13:37:34 +0000 (08:37 -0500)]
ceph-common: install ceph-mgr for rhcs on rhel

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1430 from ceph/mgr-fix
Sébastien Han [Fri, 14 Apr 2017 21:23:32 +0000 (23:23 +0200)]
Merge pull request #1430 from ceph/mgr-fix

test: add mgr section to the host inventory file

8 years agotest: add mgr section to the host inventory file 1430/head
Sébastien Han [Tue, 11 Apr 2017 12:20:11 +0000 (14:20 +0200)]
test: add mgr section to the host inventory file

Without this, we don't test the mgr role so we need to add it.

Co-Authored-by: Guillaume Abrioux <gabrioux@redhat.com>
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1448 from ceph/docs-scenario-files
Andrew Schoen [Thu, 13 Apr 2017 16:40:46 +0000 (11:40 -0500)]
Merge pull request #1448 from ceph/docs-scenario-files

docs: describe all required scenario files

8 years agodocs: describe all required scenario files 1448/head
Alfredo Deza [Thu, 13 Apr 2017 15:57:38 +0000 (11:57 -0400)]
docs: describe all required scenario files

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #1443 from WingkaiHo/osds-journal-migrate
Sébastien Han [Thu, 13 Apr 2017 14:45:57 +0000 (16:45 +0200)]
Merge pull request #1443 from WingkaiHo/osds-journal-migrate

Migrate osd(s) journal to ssd

8 years agoMerge pull request #1441 from ceph/docs-scenario
Andrew Schoen [Thu, 13 Apr 2017 14:24:11 +0000 (09:24 -0500)]
Merge pull request #1441 from ceph/docs-scenario

docs: scenario files and section descriptions

8 years agodocs: scenario files and section descriptions 1441/head
Alfredo Deza [Wed, 12 Apr 2017 17:12:00 +0000 (13:12 -0400)]
docs: scenario files and section descriptions

Signed-off-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #1442 from ceph/fix-hung-command
Sébastien Han [Thu, 13 Apr 2017 13:21:26 +0000 (15:21 +0200)]
Merge pull request #1442 from ceph/fix-hung-command

ceph-mon: change command to see if rbd exists

8 years agoMerge pull request #1439 from ceph/rhcs-tests
Andrew Schoen [Thu, 13 Apr 2017 12:23:07 +0000 (07:23 -0500)]
Merge pull request #1439 from ceph/rhcs-tests

tests: fix ceph_rhcs setup

8 years agoMigrate osd(s) journal to ssd 1443/head
WingkaiHo [Thu, 13 Apr 2017 02:56:38 +0000 (10:56 +0800)]
Migrate osd(s) journal to ssd

8 years agoceph-mon: change command to see if rbd exists 1442/head
Andrew Schoen [Wed, 12 Apr 2017 20:07:10 +0000 (15:07 -0500)]
ceph-mon: change command to see if rbd exists

The previous command was hanging, see this issue:

https://github.com/ceph/ceph-ansible/issues/1440

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: print contents of group_vars/all after modification 1439/head
Andrew Schoen [Wed, 12 Apr 2017 14:23:21 +0000 (09:23 -0500)]
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>
8 years agoceph-common: is ceph_rchs is True do not include install_on_redhat.yml
Andrew Schoen [Wed, 12 Apr 2017 12:55:03 +0000 (07:55 -0500)]
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>
8 years agotests: set needed config in group_vars/all for rhcs testing
Andrew Schoen [Wed, 12 Apr 2017 12:53:49 +0000 (07:53 -0500)]
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>
8 years agotests: remove CEPH_STABLE environment variable
Andrew Schoen [Wed, 12 Apr 2017 12:50:41 +0000 (07:50 -0500)]
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>
8 years agoMerge pull request #1435 from dlupescu/purge_cluster_nvme_fix
Sébastien Han [Wed, 12 Apr 2017 09:25:11 +0000 (11:25 +0200)]
Merge pull request #1435 from dlupescu/purge_cluster_nvme_fix

purge-cluster: fix grep match for NVMe and HP Smart Array devices

8 years agoMerge pull request #1431 from mcv21/restricted_assemble
Sébastien Han [Wed, 12 Apr 2017 09:04:25 +0000 (11:04 +0200)]
Merge pull request #1431 from mcv21/restricted_assemble

Only assemble {{ cluster }}.conf and osd.conf

8 years agoMerge pull request #1434 from ceph/docs-missing-static-master
Alfredo Deza [Tue, 11 Apr 2017 13:48:03 +0000 (09:48 -0400)]
Merge pull request #1434 from ceph/docs-missing-static-master

Docs missing static master

8 years agoOnly include cluster.conf and osd.conf when building ceph.conf 1431/head
Matthew Vernon [Tue, 11 Apr 2017 13:33:21 +0000 (14:33 +0100)]
Only include cluster.conf and osd.conf when building ceph.conf

This is the same fix as bc846b7da6d9af16d9611fef7f00df6557f19def
applied to the other part of the code-base that builds ceph.conf (I'd
missed that 349b9ab3e72f188c50b5f84f3ce5ee2fddcfbf80 had duplicated
this code).

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
8 years agopurge-cluster: fix grep match for NVMe and HP Smart Array devices 1435/head
Daniel Lupescu [Tue, 11 Apr 2017 12:59:49 +0000 (15:59 +0300)]
purge-cluster: fix grep match for NVMe and HP Smart Array devices

raw_device would return invalid block device names for NVMe and HPSA
devices which would cause sgdisk partition deletion to fail

$ echo /dev/nvme1n1p3 | egrep -o '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p){1,2}'
/dev/nvme1n1p

$ echo /dev/cciss/c0d0p2 |  egrep -o '/dev/([hsv]d[a-z]{1,2}|cciss/c[0-9]d[0-9]p|nvme[0-9]n[0-9]p){1,2}'
/dev/cciss/c0d0p

8 years agodocs: force an empty _static dir so sphinx is happy 1434/head
Alfredo Deza [Tue, 11 Apr 2017 13:08:08 +0000 (09:08 -0400)]
docs: force an empty _static dir so sphinx is happy

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aacbbf0efe802e9282793dfc8bf7b175596c5aad)

8 years agodocs: force an empty _templates dir so sphinx is happy
Alfredo Deza [Tue, 11 Apr 2017 13:08:45 +0000 (09:08 -0400)]
docs: force an empty _templates dir so sphinx is happy

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 66a9817e56d69b046425dc04a03869fb9a9d8369)

8 years agoOnly assemble {{ cluster }}.conf and osd.conf
Matthew Vernon [Tue, 11 Apr 2017 12:27:19 +0000 (13:27 +0100)]
Only assemble {{ cluster }}.conf and osd.conf

Ansible's assemble module by default will put all files in the src
directory together into dest. We only want to put {{ cluster }}.conf
and osd.conf together, not anything that might have found its way into
/etc/ceph/ceph.d (e.g. files left by the sysadmin taking backups
before an ansible run). So specify a regexp that matches only those
two files.

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
8 years agoMerge pull request #1428 from ceph/fix-mgr
Sébastien Han [Tue, 11 Apr 2017 11:53:42 +0000 (13:53 +0200)]
Merge pull request #1428 from ceph/fix-mgr

mon: fix with_items being evaluated before when

8 years agomon: fix with_items being evaluated before when 1428/head
Sébastien Han [Tue, 11 Apr 2017 10:10:55 +0000 (12:10 +0200)]
mon: fix with_items being evaluated before when

Ansible evaluates the 'with_items' before the 'when' so if the inventory
does not have the group declared it'll fail. To fix this, we set an
empty array to make the with_items happy and then evaluate with the
'when'.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1427 from ceph/downstream-testing
Alfredo Deza [Mon, 10 Apr 2017 18:55:30 +0000 (14:55 -0400)]
Merge pull request #1427 from ceph/downstream-testing

tests: updates for rhcs testing

8 years agotests: enable the rhcs-7-extras-nightly repo on test nodes 1427/head
Andrew Schoen [Mon, 10 Apr 2017 18:46:03 +0000 (13:46 -0500)]
tests: enable the rhcs-7-extras-nightly repo on test nodes

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: change centos/atomic-host box name to rhel7
Andrew Schoen [Mon, 10 Apr 2017 18:39:16 +0000 (13:39 -0500)]
tests: change centos/atomic-host box name to rhel7

We'd like to test everything rhcs on the same rhel7 box.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1425 from ceph/bump-kraken v2.2.0
Sébastien Han [Mon, 10 Apr 2017 17:03:39 +0000 (19:03 +0200)]
Merge pull request #1425 from ceph/bump-kraken

common: bump ceph version to kraken

8 years agocommon: bump ceph version to kraken 1425/head
Sébastien Han [Mon, 10 Apr 2017 14:20:49 +0000 (16:20 +0200)]
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>
8 years agoMerge pull request #1377 from ceph/ceph-mgr
Sébastien Han [Mon, 10 Apr 2017 15:50:24 +0000 (17:50 +0200)]
Merge pull request #1377 from ceph/ceph-mgr

mgr: add new role for ceph-mgr

8 years agotest: add mgr bootstrap support 1377/head
Sébastien Han [Thu, 6 Apr 2017 15:26:52 +0000 (17:26 +0200)]
test: add mgr bootstrap support

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: fix monitors name
Sébastien Han [Tue, 28 Mar 2017 12:15:27 +0000 (14:15 +0200)]
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>
8 years agomgr: add new role for ceph-mgr
Sébastien Han [Thu, 16 Mar 2017 09:17:08 +0000 (10:17 +0100)]
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>
8 years agoMerge pull request #1421 from ceph/tox-docs
Alfredo Deza [Mon, 10 Apr 2017 11:56:40 +0000 (07:56 -0400)]
Merge pull request #1421 from ceph/tox-docs

tox-driven docs

8 years agoMerge pull request #1422 from k0ste/newfeature
Sébastien Han [Mon, 10 Apr 2017 09:07:39 +0000 (11:07 +0200)]
Merge pull request #1422 from k0ste/newfeature

ceph-common: persist "disable_transparent_hugepage"

8 years agoceph-common: disable_transparent_hugepage now persist 1422/head
Konstantin Shalygin [Sat, 8 Apr 2017 06:06:18 +0000 (13:06 +0700)]
ceph-common: disable_transparent_hugepage now persist