mgr/cephadm: Fix IPv6 in monitoring services#43579
Merged
sebastian-philipp merged 5 commits intoceph:masterfrom Oct 26, 2021
Merged
mgr/cephadm: Fix IPv6 in monitoring services#43579sebastian-philipp merged 5 commits intoceph:masterfrom
sebastian-philipp merged 5 commits intoceph:masterfrom
Conversation
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Contributor
Author
|
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
e7c502e to
c1c1e96
Compare
adk3798
approved these changes
Oct 19, 2021
|
|
||
| with with_host(cephadm_module, 'test'): | ||
|
|
||
| yaml_str = """service_type: alertmanager |
Contributor
There was a problem hiding this comment.
Any reason for not using dedent here as well? I think it looks much nicer in the places you did use it.
Contributor
Author
There was a problem hiding this comment.
no particular reason. but I'll look into using dedent more often!
Contributor
Author
|
Failures (TODO: Add tracker links):
|
s0nea
pushed a commit
to s0nea/ceph_ceph
that referenced
this pull request
Mar 17, 2022
There are two different ways to get the host address. From the inventory of the mgr object directly or via the `_inventory_get_addr` method of `CephadmService`. Update the code in order to use the `_inventory_get_addr` method only. Signed-off-by: Tatjana Dehler <tdehler@suse.com> (cherry picked from commit a1ee73f) Conflicts: src/pybind/mgr/cephadm/services/monitoring.py Fixed a few conflicts because the upstream master contains some improvements around handling URLs, e.g. ceph#43579
s0nea
pushed a commit
to s0nea/ceph_ceph
that referenced
this pull request
Mar 17, 2022
Fixes: https://tracker.ceph.com/issues/54502 Signed-off-by: Tatjana Dehler <tdehler@suse.com> (cherry picked from commit e233ed0) Conflicts: src/pybind/mgr/cephadm/services/cephadmservice.py Fixed conflict because `get_keyring_with_caps` has not been backported to octopus: ceph#39677 src/pybind/mgr/cephadm/services/monitoring.py Fixed a few conflicts because the upstream master contains some improvements around handling URLs, e.g. ceph#43579
s0nea
pushed a commit
to s0nea/ceph_ceph
that referenced
this pull request
Mar 24, 2022
There are two different ways to get the host address. From the inventory of the mgr object directly or via the `_inventory_get_addr` method of `CephadmService`. Update the code in order to use the `_inventory_get_addr` method only. Signed-off-by: Tatjana Dehler <tdehler@suse.com> (cherry picked from commit 3038506) Conflicts: src/pybind/mgr/cephadm/services/monitoring.py Fixed a few conflicts because the master contains some improvements around handling URLs, e.g. ceph#43579
s0nea
pushed a commit
to s0nea/ceph_ceph
that referenced
this pull request
Mar 24, 2022
Fixes: https://tracker.ceph.com/issues/54502 Signed-off-by: Tatjana Dehler <tdehler@suse.com> (cherry picked from commit 4f14993) Conflicts: src/pybind/mgr/cephadm/services/cephadmservice.py Fixed conflict because `get_keyring_with_caps` has not been backported to octopus: ceph#39677 src/pybind/mgr/cephadm/services/monitoring.py Fixed a few conflicts because the master contains some improvements around handling URLs, e.g. ceph#43579
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
2 participants
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.
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox