octopus: cephadm: batch backport June (1)#35347
Merged
sebastian-philipp merged 26 commits intoceph:octopusfrom Jun 4, 2020
Conversation
Fixes: https://tracker.ceph.com/issues/45584 Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 58eaeb5)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 3c3a97e)
Fixes: https://tracker.ceph.com/issues/45617 Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit ac61f51)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 41c0ccd)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 959ee9b)
Fixes: https://tracker.ceph.com/issues/45377 Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit 34765e9)
A new section to describe the command used to blink lights in physical devices Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> (cherry picked from commit e025727)
Currently we make and cache connections to nodes during a check_host. If a cached connection is disconnect from the other end the remoto connection object doesn't track this, so further checks to the host fail. I have pushed up a PR[0] to remoto to add a `has_connection` method to their `BaseConnection` class, which we now use in this patch to check to see if the connection is stale. If it is it is then recreated. There is some monkey patching happening so we can add the required `has_connection` to remoto in this patch which we can remove as soon as the other PR have landed and a new version of remoto is released. [0] alfredodeza/remoto#56 Fixes: https://tracker.ceph.com/issues/45627 Fixes: https://tracker.ceph.com/issues/45032 Signed-off-by: Matthew Oliver <moliver@suse.com> (cherry picked from commit afabf82)
Fixes: https://tracker.ceph.com/issues/45596 Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 261c769)
The api user and password is required in order to use the API so let's make these mandatory. The `ceph orch daemon add iscsi` now has them mandatory: ceph orch daemon add iscsi <pool> <api_user> <api_password> If your using apply with a yaml file, the validate_add in the spec now checks for these too. Signed-off-by: Matthew Oliver <moliver@suse.com> (cherry picked from commit a36165b)
Fixes: https://tracker.ceph.com/issues/45629 Signed-off-by: Ricardo Marques <rimarques@suse.com> (cherry picked from commit ad75937)
Custom ssh config can be provided by using the '--ssh-config' option Signed-off-by: Ricardo Marques <rimarques@suse.com> (cherry picked from commit 84c390f)
previews Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit fc3b4d1)
There's no reason for this cap to be used for talking to the MDS. The individual exports have their own caps for talking to the file system. Fixes: https://tracker.ceph.com/issues/45632 Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> (cherry picked from commit dac13ab)
Namely, - Grafana - Prometheus - Alertmanager and - Node exporter. Fixes: https://tracker.ceph.com/issues/45463 Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit 5d601bc)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit d76bf4c)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit bf20608)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit 41cbca7)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit 07583d2)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit 7ca3b47)
Fixes: https://tracker.ceph.com/issues/45696 Signed-off-by: Ricardo Marques <rimarques@suse.com> (cherry picked from commit 1ceca64)
…Manager Calling Dashboard's CLI to set service URLs after deploying Prometheus and AlertManager Daemons. Fixes: https://tracker.ceph.com/issues/45625 Signed-off-by: Kiefer Chang <kiefer.chang@suse.com> (cherry picked from commit a613542)
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com> (cherry picked from commit c336d60)
Adding a check for already bootstrapped clusters where the image is already set to avoid overriding it. Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com> (cherry picked from commit fabcbea)
Signed-off-by: Zac Dover <zac.dover@gmail.com> Incorporating mgfritch's improvements. Signed-off-by: Zac Dover <zac.dover@gmail.com> s/docker/podman/ -- as per mgfritch's suggestion Signed-off-by: Zac Dover <zac.dover@gmail.com> s/: latest/:latest/ Signed-off-by: Zac Dover <zac.dover@gmail.com> s/image ids/image IDs/ -- as per Alex Settle's suggestion. Signed-off-by: Zac Dover <zac.dover@gmail.com> Add note warning against the :latest tag. Signed-off-by: Zac Dover <zac.dover@gmail.com> s/image ids/image IDs/ -- as per Alex Settle's suggestion. Signed-off-by: Zac Dover <zac.dover@gmail.com> Linked to container page from cephadm install page. Signed-off-by: Zac Dover <zac.dover@gmail.com> Clarified the note directing readers to the container documentation. Signed-off-by: Zac Dover <zac.dover@gmail.com> (cherry picked from commit f0fe087)
mgfritch
reviewed
Jun 2, 2020
Contributor
There was a problem hiding this comment.
This PR needs a backport of #33886 to Octopus --
==================================== ERRORS ====================================
_____________________ ERROR collecting cephadm/__init__.py _____________________
cephadm/__init__.py:5: in <module>
tests.mock_ceph_modules() # type: ignore
E AttributeError: module 'tests' has no attribute 'mock_ceph_modules'
____________________ ERROR collecting cephadm/inventory.py _____________________
.tox/py3/lib/python3.6/site-packages/py/_path/local.py:701: in pyimport
__import__(modname)
cephadm/__init__.py:5: in <module>
tests.mock_ceph_modules() # type: ignore
E AttributeError: module 'tests' has no attribute 'mock_ceph_modules'
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 6b029c0)
Contributor
Author
|
(excluding the very latest dashbaord commit) |
mgfritch
approved these changes
Jun 4, 2020
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #35104, #35142, #34902, #35198, #35097, #35195, #35266, #35159, #35106, #35229, #35194, #35006, #35287, #35124, #35281
UPDATE: also backport of #34902