Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cephadm-adopt: Fixes binding network for alertmanager (backport #7576) #7590

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 5, 2024

Alertmanager was bind to default * network instead of grafana_server_addr as it was before. Now on if grafana_server_addr is defined, it will be bind to that network.


This is an automatic backport of pull request #7576 done by Mergify.

@mergify mergify bot added the conflicts label Aug 5, 2024
Copy link
Author

mergify bot commented Aug 5, 2024

Cherry-pick of 0bf3398 has failed:

On branch mergify/bp/stable-7.0/pr-7576
Your branch is up to date with 'origin/stable-7.0'.

You are currently cherry-picking commit 0bf339877.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   infrastructure-playbooks/cephadm-adopt.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Alertmanager was bind to default * network instead of grafana_server_addr
as it was before. Now on if grafana_server_addr is defined, it will be
bind to that network.

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit 0bf3398)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7576 branch from 83367f7 to 6cd4181 Compare August 5, 2024 12:03
@asm0deuz asm0deuz removed the conflicts label Aug 5, 2024
Copy link
Collaborator

@asm0deuz asm0deuz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asm0deuz asm0deuz merged commit c114822 into stable-7.0 Aug 6, 2024
26 of 27 checks passed
@mergify mergify bot deleted the mergify/bp/stable-7.0/pr-7576 branch August 6, 2024 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant