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

[2.8] [docker_network] Fix idempotency when using aux_addresses in ipam_config #56972

Merged
merged 2 commits into from May 28, 2019

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Backport of #56901 to stable-2.8. Fixes idempotency for aux_addresses.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_network

…fig (ansible#56901)

* [docker_network] Fix idempotency when using aux_addresses in ipam_config

Mismatch between keys returned by Docker API (AuxilliaryAddresses) vs
expected by Ansible module (aux_addresses) resulted in tasks always
have status 'changed'. The existing code normalizing one set of
keys to another missed this special case where converting
CamelCase to lowercase is not sufficent.

Please see
https://github.com/moby/moby/blob/master/api/types/network/network.go
for reference.

* Correct keywords formatting in changelog file

Co-Authored-By: Felix Fontein <felix@fontein.de>
(cherry picked from commit 37df89b)
@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. docker module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. labels May 26, 2019
Copy link
Contributor

@SirFerdek SirFerdek left a comment

Choose a reason for hiding this comment

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

Fine for me! ;)

…e#56975)

Integration tests for pull request ansible#56901 which fixes found issues with idempotence.

(cherry picked from commit 6a50c6a)
@felixfontein
Copy link
Contributor Author

I also included the extended tests from #56975.

@ansibot ansibot added the test This PR relates to tests. label May 26, 2019
:type key: str
:return Ansible module key
:rtype str
"""
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a note, we use sphinx's format for documenting parameters.

@abadger abadger merged commit 0a624ea into ansible:stable-2.8 May 28, 2019
@abadger
Copy link
Contributor

abadger commented May 28, 2019

Merged or the 2.8.1 release.

@felixfontein felixfontein deleted the backport/2.8/56901 branch May 29, 2019 03:42
@mkrizek mkrizek removed needs_triage Needs a first human triage before being processed. labels May 29, 2019
@ansible ansible locked and limited conversation to collaborators Aug 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.8 This issue/PR affects Ansible v2.8 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. cloud community_review In order to be merged, this PR must follow the community review workflow. docker module This issue/PR relates to a module. support:community This issue/PR relates to code supported by the Ansible community. test This PR relates to tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants