Commit Graph

2586 Commits (a951b7f957d2debea6a1c6087ee52dda2f92895e)
 

Author SHA1 Message Date
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
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
Konstantin Shalygin 334d4cb885
ceph-common: disable_transparent_hugepage now persist 2017-04-08 13:06:18 +07:00
Alfredo Deza 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
Alfredo Deza 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
Alfredo Deza 7eb26d1b00 docs: fix typo in testing/index.rst
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:17:31 -04:00
Alfredo Deza 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
Alfredo Deza f895b4c376 docs: create a tests doc file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:07:42 -04:00
Alfredo Deza cb504f6d88 docs: create a separate tox doc file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:07:26 -04:00
Alfredo Deza 41815f6b53 docs: use glossary for the :doc: directive
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:06:36 -04:00
Alfredo Deza 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
Alfredo Deza a5b2ede0ff docs: normalize the glossary vs. contents files
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 12:05:55 -04:00
Alfredo Deza 14d46cb2be docs: create a separate docs tox.ini
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-07 11:41:59 -04:00
Sébastien Han 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
Sébastien Han 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
Andrew Schoen 8e45c17a40 Merge pull request #1418 from ceph/docs
Docs: an initial take on only test documentation
2017-04-06 15:05:40 -05:00
Alfredo Deza 1f3d78e6c2 docs: initial structure for tests docs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:17:54 -04:00
Alfredo Deza 0d0e427a6c docs create a separate glossary file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:17:54 -04:00
Alfredo Deza 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
Alfredo Deza 1ad331b026 docs: ignore build contents from git
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:11:52 -04:00
Alfredo Deza 1a181fff4c docs: initial take on doc structure
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-06 13:11:52 -04:00
Andrew Schoen 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
Andrew Schoen 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
WingkaiHo 6ad8288c91 enable ceph-mon.target service after monitor start
ceph-create-keys unit file was removed here:

* 8bcb4646b6
* dc5fe8d415

As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.

Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.

ceph fix: https://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