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

Foreman facts uploading correctly merges facts #1155

Merged
merged 3 commits into from Mar 22, 2021

Conversation

adamruzicka
Copy link
Contributor

Adapted from ansible/ansible#51546

@ares
Copy link
Member

ares commented Mar 12, 2021

Makes the callback work much better! 👍 (I don't have merge permissions here)

@evgeni
Copy link
Member

evgeni commented Mar 12, 2021

@ares uh, you do!

@adamruzicka thanks! Could you please add a changelog snippet to https://github.com/theforeman/foreman-ansible-modules/tree/develop/changelogs/fragments?

@evgeni
Copy link
Member

evgeni commented Mar 12, 2021

Also, this seems to have more changes than just the new merging? ;)

@ares
Copy link
Member

ares commented Mar 13, 2021

There are several refactorings that were made in the original repo I think.

@ares
Copy link
Member

ares commented Mar 16, 2021

@adamruzicka please let me know when you add a changelog, if I really have merge permissions, I'm happy to merge afterwards :-)

The callback plugin collects facts during the run, merges them correctly and
uploads them once at the end.

Adapted from ansible/ansible#51546
@adamruzicka
Copy link
Contributor Author

Updated and the tests are 🍏

Copy link
Member

@ares ares left a comment

Choose a reason for hiding this comment

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

Thanks @adamruzicka, merging!

@ares ares merged commit 19fe3f4 into theforeman:develop Mar 22, 2021
@evgeni
Copy link
Member

evgeni commented Apr 21, 2021

@ares @adamruzicka what in this PR requires requests 2.14? That's not available on EL7, making the callback less useful on one of our main platforms

@adamruzicka adamruzicka deleted the callback branch April 22, 2021 07:12
@adamruzicka
Copy link
Contributor Author

@evgeni Built in json encoding ansible/ansible@11fab2d

@evgeni
Copy link
Member

evgeni commented Apr 22, 2021

So post(json=…)? Interesting.

@evgeni
Copy link
Member

evgeni commented Apr 22, 2021

I'd argue it's there since 2.4.2 (and that's why apypie depends on >= 2.4.2): psf/requests@8f17741

@adamruzicka
Copy link
Contributor Author

cc @ekohl could the 14 be a typo?

@evgeni
Copy link
Member

evgeni commented Apr 22, 2021

And 2.14 is from 2017: https://github.com/psf/requests/releases/tag/v2.14.0

So the explanation in that commit is wrong

@ekohl
Copy link
Member

ekohl commented Apr 22, 2021

It does look like I made a mistake here, but at least I documented why it was needed. And the 2014 was correct :)

@adamruzicka
Copy link
Contributor Author

Fixed in #1205

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.

None yet

4 participants