Commit Graph

2609 Commits (d5ee82d29598a61eb4717856a68073103693ca3d)
 

Author SHA1 Message Date
Sébastien Han 4d244eeeb4 Merge pull request #1459 from jcsp/wip-19713
mon: update mgr key capabilities
2017-04-21 13:34:46 -05:00
Andrew Schoen 8ba1624f21 tests: mgr nodes should have the ceph-mon repo install
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-21 10:45:33 -07:00
John Spray 3a0d03656f 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>
2017-04-21 12:15:25 +01:00
Sébastien Han c9c65a7072 Merge pull request #1456 from netservers/master
Apparmor on Ubuntu Xenial will not permit containers to mount devices.
2017-04-19 14:25:41 -05:00
John McEleney f1388dc2c2 Apparmor on Ubuntu Xenial will not permit containers to mount devices, even with CAP SYS_ADMIN. 2017-04-19 19:22:02 +01:00
Andrew Schoen e8e4245e43 Merge pull request #1453 from ceph/docs-fixtures
[docs] fixtures and Python tests
2017-04-17 15:46:02 -05:00
Alfredo Deza eaba3cf501 Merge pull request #1454 from ceph/tox-docs
docs: write docs for tox.ini file
2017-04-17 16:43:05 -04:00
Andrew Schoen 03cafa3108 docs: review feedback on testing/tox.rst
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-17 15:39:01 -05:00
Andrew Schoen b45209c951 docs: fix rst error in scenarios.rst
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-17 15:29:18 -05:00
Andrew Schoen 80142ef3fd docs: write docs for tox.ini file
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-17 15:29:18 -05:00
Alfredo Deza 697e7534d0 docs: describe Python tests and fixtures
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-17 16:28:52 -04:00
Alfredo Deza f50494d7be docs: conventions for test layouts
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-17 16:28:52 -04:00
Andrew Schoen 4858df733c Merge pull request #1452 from ceph/rhcs-mgr
ceph-common: install ceph-mgr for rhcs
2017-04-17 13:27:53 -05:00
Andrew Schoen be3e0d772c ceph-common: install ceph-mgr for rhcs on debian
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-17 08:40:24 -05:00
Andrew Schoen 30098f4e34 ceph-common: install ceph-mgr for rhcs on rhel
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-17 08:37:34 -05:00
Sébastien Han 3c8e41c748 Merge pull request #1430 from ceph/mgr-fix
test: add mgr section to the host inventory file
2017-04-14 23:23:32 +02:00
Sébastien Han dfd8f4d96e 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>
2017-04-15 00:16:10 +02:00
Andrew Schoen d3cdc62e49 Merge pull request #1448 from ceph/docs-scenario-files
docs: describe all required scenario files
2017-04-13 11:40:46 -05:00
Alfredo Deza edc7872cea docs: describe all required scenario files
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-13 12:03:41 -04:00
Sébastien Han 17ac1fd464 Merge pull request #1443 from WingkaiHo/osds-journal-migrate
Migrate osd(s) journal to ssd
2017-04-13 16:45:57 +02:00
Andrew Schoen 6f2effea66 Merge pull request #1441 from ceph/docs-scenario
docs: scenario files and section descriptions
2017-04-13 09:24:11 -05:00
Alfredo Deza 7412c085f0 docs: scenario files and section descriptions
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-13 10:17:55 -04:00
Sébastien Han 804aa529bb Merge pull request #1442 from ceph/fix-hung-command
ceph-mon: change command to see if rbd exists
2017-04-13 15:21:26 +02:00
Andrew Schoen ebed16e9a5 Merge pull request #1439 from ceph/rhcs-tests
tests: fix ceph_rhcs setup
2017-04-13 07:23:07 -05:00
WingkaiHo 9fba41b4ce Migrate osd(s) journal to ssd 2017-04-13 11:05:58 +08:00
Andrew Schoen 9ce0c2808e 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>
2017-04-12 15:07:10 -05:00
Andrew Schoen 0e6d89b9db 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>
2017-04-12 09:23:21 -05:00
Andrew Schoen 37d38b122b 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>
2017-04-12 07:55:03 -05:00
Andrew Schoen 386afbec83 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>
2017-04-12 07:53:49 -05:00
Andrew Schoen 63983fa0b7 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>
2017-04-12 07:50:41 -05:00
Sébastien Han bda744a5f4 Merge pull request #1435 from dlupescu/purge_cluster_nvme_fix
purge-cluster: fix grep match for NVMe and HP Smart Array devices
2017-04-12 11:25:11 +02:00
Sébastien Han 4824966ee2 Merge pull request #1431 from mcv21/restricted_assemble
Only assemble {{ cluster }}.conf and osd.conf
2017-04-12 11:04:25 +02:00
Alfredo Deza a6ed3fb18c Merge pull request #1434 from ceph/docs-missing-static-master
Docs missing static master
2017-04-11 09:48:03 -04:00
Matthew Vernon e3a6429e73 Only include cluster.conf and osd.conf when building ceph.conf
This is the same fix as bc846b7da6
applied to the other part of the code-base that builds ceph.conf (I'd
missed that 349b9ab3e7 had duplicated
this code).

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
2017-04-11 14:33:21 +01:00
Daniel Lupescu d5e56c481a 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
2017-04-11 16:13:28 +03:00
Alfredo Deza d26ed99dcc docs: force an empty _static dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aacbbf0efe)
2017-04-11 09:11:09 -04:00
Alfredo Deza df315fef89 docs: force an empty _templates dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 66a9817e56)
2017-04-11 09:11:01 -04:00
Matthew Vernon bc846b7da6 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>
2017-04-11 13:27:19 +01:00
Sébastien Han a9fdb81eb1 Merge pull request #1428 from ceph/fix-mgr
mon: fix with_items being evaluated before when
2017-04-11 13:53:42 +02:00
Sébastien Han 05331a2634 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>
2017-04-11 12:10:55 +02:00
Alfredo Deza 8707537c14 Merge pull request #1427 from ceph/downstream-testing
tests: updates for rhcs testing
2017-04-10 14:55:30 -04:00
Andrew Schoen 35aab1274a tests: enable the rhcs-7-extras-nightly repo on test nodes
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-10 13:46:03 -05:00
Andrew Schoen 6145a809ba 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>
2017-04-10 13:39:16 -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