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

cobbler: Properly determine cobbler_ip_address #6925

Merged

Conversation

opoplawski
Copy link
Contributor

SUMMARY

This fixes the recently added cobbler_ip_address calculation.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

inventory/cobbler.py

@ansibullbot ansibullbot added bug This issue/PR relates to a bug inventory inventory plugin plugins plugin (any type) labels Jul 13, 2023
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-6 labels Jul 13, 2023
@felixfontein
Copy link
Collaborator

Can you add a changelog fragment? Thanks!

@opoplawski opoplawski force-pushed the cobbler_ip_address branch from cc98502 to f7440b0 Compare July 13, 2023 20:06
@felixfontein felixfontein merged commit 1c4e2d5 into ansible-collections:main Jul 15, 2023
@patchback
Copy link

patchback bot commented Jul 15, 2023

Backport to stable-6: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 1c4e2d5 on top of patchback/backports/stable-6/1c4e2d51b2189c9b99807f012549fbfa91da2ba0/pr-6925

Backporting merged PR #6925 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-6/1c4e2d51b2189c9b99807f012549fbfa91da2ba0/pr-6925 upstream/stable-6
  4. Now, cherry-pick PR cobbler: Properly determine cobbler_ip_address #6925 contents into that branch:
    $ git cherry-pick -x 1c4e2d51b2189c9b99807f012549fbfa91da2ba0
    If it'll yell at you with something like fatal: Commit 1c4e2d51b2189c9b99807f012549fbfa91da2ba0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1c4e2d51b2189c9b99807f012549fbfa91da2ba0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR cobbler: Properly determine cobbler_ip_address #6925 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-6/1c4e2d51b2189c9b99807f012549fbfa91da2ba0/pr-6925
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Jul 15, 2023
@patchback
Copy link

patchback bot commented Jul 15, 2023

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/1c4e2d51b2189c9b99807f012549fbfa91da2ba0/pr-6925

Backported as #6940

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@opoplawski thanks for your contribution!

patchback bot pushed a commit that referenced this pull request Jul 15, 2023
cobbler: Properly determine cobbler_ipv4/6_address
(cherry picked from commit 1c4e2d5)
felixfontein pushed a commit that referenced this pull request Jul 15, 2023
…bbler_ip_address (#6940)

cobbler: Properly determine cobbler_ip_address (#6925)

cobbler: Properly determine cobbler_ipv4/6_address
(cherry picked from commit 1c4e2d5)

Co-authored-by: Orion Poplawski <[email protected]>
valeriopoggi pushed a commit to valeriopoggi/community.general that referenced this pull request Jul 17, 2023
)

cobbler: Properly determine cobbler_ipv4/6_address
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug inventory inventory plugin plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants