4824966ee2
Merge pull request #1431 from mcv21/restricted_assemble
...
Only assemble {{ cluster }}.conf and osd.conf
2017-04-12 11:04:25 +02:00
a6ed3fb18c
Merge pull request #1434 from ceph/docs-missing-static-master
...
Docs missing static master
2017-04-11 09:48:03 -04:00
e3a6429e73
Only include cluster.conf and osd.conf when building ceph.conf
...
This is the same fix as bc846b7da6349b9ab3e7
2017-04-11 14:33:21 +01:00
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
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
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
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
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
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
8707537c14
Merge pull request #1427 from ceph/downstream-testing
...
tests: updates for rhcs testing
2017-04-10 14:55:30 -04:00
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
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
186a392656
Merge pull request #1425 from ceph/bump-kraken
...
common: bump ceph version to kraken
2017-04-10 19:03:39 +02:00
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
d113cf854c
Merge pull request #1377 from ceph/ceph-mgr
...
mgr: add new role for ceph-mgr
2017-04-10 17:50:24 +02:00
61a8b26d59
test: add mgr bootstrap support
...
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-04-10 15:13:13 +02:00
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
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
67d83586f3
Merge pull request #1421 from ceph/tox-docs
...
tox-driven docs
2017-04-10 07:56:40 -04:00
7170669daf
Merge pull request #1422 from k0ste/newfeature
...
ceph-common: persist "disable_transparent_hugepage"
2017-04-10 11:07:39 +02:00
334d4cb885
ceph-common: disable_transparent_hugepage now persist
2017-04-08 13:06:18 +07:00
e8ae5c6aaf
docs: add missing sections/refs in scenarios.rst
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:18:15 -04:00
c768f34219
docs: include testing conventions and testinfra in layout.rst
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:17:53 -04:00
7eb26d1b00
docs: fix typo in testing/index.rst
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:17:31 -04:00
3cde692482
docs: include the tests and tox files in the glossary
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:17:13 -04:00
f895b4c376
docs: create a tests doc file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:07:42 -04:00
cb504f6d88
docs: create a separate tox doc file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:07:26 -04:00
41815f6b53
docs: use glossary for the :doc: directive
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:06:36 -04:00
ae6349fd21
docs: add the testing glossary in the toctree
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:06:16 -04:00
a5b2ede0ff
docs: normalize the glossary vs. contents files
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:05:55 -04:00
14d46cb2be
docs: create a separate docs tox.ini
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 11:41:59 -04:00
e2c8f1a404
Merge pull request #1412 from guits/fix_handlers
...
Common: Fix handlers that are not properly triggered.
2017-04-07 02:36:27 +02:00
a5caccaefb
Merge pull request #1416 from ceph/WingkaiHo-master
...
enable ceph-mon.target service after monitor start
2017-04-07 02:36:17 +02:00
8e45c17a40
Merge pull request #1418 from ceph/docs
...
Docs: an initial take on only test documentation
2017-04-06 15:05:40 -05:00
1f3d78e6c2
docs: initial structure for tests docs
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:17:54 -04:00
0d0e427a6c
docs create a separate glossary file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:17:54 -04:00
20210c35de
docs: the master doc is the glossary file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:17:54 -04:00
1ad331b026
docs: ignore build contents from git
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:11:52 -04:00
1a181fff4c
docs: initial take on doc structure
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:11:52 -04:00
f02679e440
Merge pull request #1417 from ceph/docker-env-vars
...
tests: add docker environment variables to tox.ini
2017-04-06 12:11:16 -05:00
16e889c30a
tests: add docker environment variables to tox.ini
...
This allows us to control the docker registry, image name and tag name
for the containers.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-06 10:29:16 -05:00
6ad8288c91
enable ceph-mon.target service after monitor start
...
ceph-create-keys unit file was removed here:
* 8bcb4646b6dc5fe8d415https://github.com/ceph/ceph/pull/14226
Signed-off-by: WingkaiHo <sanguosfiang@163.com>
Co-Authored-By: Sébastien Han <seb@redhat.com>
2017-04-06 16:58:32 +02:00
5bec62ba7c
Common: Fix handlers that are not properly triggered.
...
Until now, only the first task were executed.
The idea here is to use `listen` statement to be able to notify multiple
handler and regroup all of them in `./handlers/main.yml` as notifying an
included handler task is not possible.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-04-06 16:19:58 +02:00
e04bfdc4f0
Merge pull request #1415 from dahorak/osd-autodiscovery-fix-check-holders
...
osd autodiscovery mode: fix holders detection
2017-04-06 10:56:42 +02:00
ce06dc1460
osd autodiscovery mode: fix holders detection
...
Small fix for (probably copy&paste) issue from 42ffe6301
2017-04-06 09:11:32 +02:00
ff34513c6a
Merge pull request #1414 from ceph/scenario-alias
...
tests: add an alias of cluster for the centos7_cluster scenario
2017-04-05 17:42:06 -04:00
4ca0f7fa71
tests: add an alias of cluster for the centos7_cluster scenario
...
When testing this downstream it makes more sense for this scenario to be
named just 'cluster' because have 'centos7' in the name is misleading.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-04-05 13:36:51 -05:00
3c59ed58a5
Merge pull request #1411 from ceph/bump-ansible
...
tests: bump the version of ansible to 2.2.2
2017-04-05 16:03:20 +02:00
20a8ce90cc
Merge pull request #1409 from ceph/auto-dm
...
osd: autodiscovery mode, use holders to detect device
2017-04-05 15:58:41 +02:00
716457c6f7
Merge pull request #1410 from ceph/kraken-tests
...
tests: run all tests for jewel and kraken
2017-04-05 13:53:17 +02:00
Sébastien Han
Alfredo Deza
Matthew Vernon
Daniel Lupescu
Alfredo Deza
Andrew Schoen
Konstantin Shalygin
Andrew Schoen
WingkaiHo
Guillaume Abrioux
Daniel Horak