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

Adopt with grafana_network not grafana_server_addr (backport #7654) #7656

Open
wants to merge 1 commit into
base: stable-9.0
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 11, 2025

The networks list in a spec is usually a range not a single IP. grafana_server_addr is a fact created from grafana_network so it is a more appropriate parameter to pass.

Follow up to 770a527


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

@mergify mergify bot added the conflicts label Feb 11, 2025
Copy link
Author

mergify bot commented Feb 11, 2025

Cherry-pick of b1f7e2d has failed:

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

You are currently cherry-picking commit b1f7e2da.
  (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

The networks list in a spec is usually a list of ranges,
not a single IP. The grafana_server_addr is a fact created
from the grafana_network range so it is a more appropriate
parameter to pass to the spec.

Follow up to 770a527

Signed-off-by: John Fulton <[email protected]>
(cherry picked from commit b1f7e2d)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-9.0/pr-7654 branch from ff64526 to 3aad0b2 Compare February 11, 2025 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant