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

redhat_subscription: don't discard vars with key #5627

Conversation

ptoscano
Copy link
Contributor

SUMMARY

From the man-pages of subscription-manager, none of the parameters used is tied to activationkey except the two that remain in its else-clause.

Per the documentation, none of these should be tied to activationkey, and as such, no correct usage of the module per its documentation should be affected in a negative way.

Fixes #3486.

Notes by Pino Toscano (@ptoscano):
In reality, there are some combinations of command line options to register that are not accepted -- for example, when using --activationkey you cannot specify --consumerid, --environment, and --auto-attach; that said, since these things may change depending on the version of subscription-manager, then simply passing all the arguments and let subscription-manager figure it out is better than having to reimplement the same logic locally in this Ansible module.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

redhat_subscription

ADDITIONAL INFORMATION

Note that type is not mentioned in the man-pages on 7.6 (at least), but is still present and available.

@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug module module os packaging plugins plugin (any type) labels Nov 29, 2022
@ptoscano
Copy link
Contributor Author

Hi @thor, I took the liberty of forwarding your old PR ansible/ansible#60266 (which IMHO was good) to community.general, keeping the right credit for you. I hope it's OK!

@ptoscano ptoscano force-pushed the 3486-redhat_subscription-register-ak branch from ce74a73 to 8391222 Compare November 29, 2022 13:56
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Nov 29, 2022
Fixes ansible-collections#3486. From the man-pages of subscription-manager, none of the
parameters used are tied to the activationkey except the two that remain
in its else-clause.

Note that type is not mentioned in the man-pages on 7.6 (at least), but
is still present and available.
@ptoscano ptoscano force-pushed the 3486-redhat_subscription-register-ak branch from 8391222 to bd1fbca Compare November 29, 2022 15:41
@felixfontein felixfontein merged commit f7fa54e into ansible-collections:main Nov 30, 2022
@patchback
Copy link

patchback bot commented Nov 30, 2022

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

❌ Failed to cleanly apply f7fa54e on top of patchback/backports/stable-5/f7fa54eed9f82ea2d0287541d9bef31a8e3631d3/pr-5627

Backporting merged PR #5627 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-5/f7fa54eed9f82ea2d0287541d9bef31a8e3631d3/pr-5627 upstream/stable-5
  4. Now, cherry-pick PR redhat_subscription: don't discard vars with key #5627 contents into that branch:
    $ git cherry-pick -x f7fa54eed9f82ea2d0287541d9bef31a8e3631d3
    If it'll yell at you with something like fatal: Commit f7fa54eed9f82ea2d0287541d9bef31a8e3631d3 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x f7fa54eed9f82ea2d0287541d9bef31a8e3631d3
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR redhat_subscription: don't discard vars with key #5627 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/f7fa54eed9f82ea2d0287541d9bef31a8e3631d3/pr-5627
  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 Nov 30, 2022
@patchback
Copy link

patchback bot commented Nov 30, 2022

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/f7fa54eed9f82ea2d0287541d9bef31a8e3631d3/pr-5627

Backported as #5633

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

patchback bot pushed a commit that referenced this pull request Nov 30, 2022
Fixes #3486. From the man-pages of subscription-manager, none of the
parameters used are tied to the activationkey except the two that remain
in its else-clause.

Note that type is not mentioned in the man-pages on 7.6 (at least), but
is still present and available.

Co-authored-by: Thor K. H <thor@roht.no>
(cherry picked from commit f7fa54e)
@felixfontein
Copy link
Collaborator

@thor @ptoscano thanks for fixing this!

felixfontein pushed a commit that referenced this pull request Nov 30, 2022
Fixes #3486. From the man-pages of subscription-manager, none of the
parameters used are tied to the activationkey except the two that remain
in its else-clause.

Note that type is not mentioned in the man-pages on 7.6 (at least), but
is still present and available.

Co-authored-by: Thor K. H <thor@roht.no>
(cherry picked from commit f7fa54e)

Co-authored-by: Pino Toscano <ptoscano@redhat.com>
@thor
Copy link
Contributor

thor commented Dec 1, 2022

Thanks to @ptoscano for picking up this ancient PR of mine! 🥳 I'd entirely forgotten it existed.

@ptoscano ptoscano deleted the 3486-redhat_subscription-register-ak branch December 1, 2022 07:08
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 has_issue module module os packaging plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

redhat_subscription: consumer_name is ignored
4 participants