internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 05:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker_swarm_service: Fix publish idempotency when mode is None (#50882)

Browse Source 
* Fix publish idempotency when mode is None

* Add changelog fragment

* Python 2.6 compat

* Use self.publish

* Check length of publish before comparing content

* Sort publish lists before zipping

* Enable publish tests

* python3 compat

* Don’t sort by mode as it is not safe

* Document publish suboptions and add them to args

* Add type to publish documentation

* Add choices to publish argument_spec suboptions

* Make tcp the default protocol

* Make documentation reflect protocol default

* Simplify setting mode

* Remove redundant string quoting

* Test order of publish

* Add comment about publish change detection
This commit is contained in:
Hannes Ljungberg
2019-01-21 20:02:08 +01:00
committed by ansibot
parent 420c24ea55
commit 7ceb2ac95a
3 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
test/integration/targets/docker_swarm_service/tasks/tests/options.yml
View File

@@ -954,14 +954,6 @@
## publish #########################################################
####################################################################
# FIXME: publish_2 is not marked as changed
#fatal: [testhost]: FAILED! => {
# "assertion": "publish_2 is not changed",
# "changed": false,
# "evaluated_to": false,
# "msg": "Assertion failed"
#}
- name: publish
docker_swarm_service:
name: "{{ service_name }}"
@@ -975,37 +967,68 @@
target_port: 60002
register: publish_1
#- name: publish (idempotency)
# docker_swarm_service:
# name: "{{ service_name }}"
# image: alpine:3.8
# publish:
# - protocol: tcp
# published_port: 60001
# target_port: 60001
# - protocol: udp
# published_port: 60001
# target_port: 60001
# register: publish_2
#
#- name: publish (change)
# docker_swarm_service:
# name: "{{ service_name }}"
# image: alpine:3.8
# publish:
# - protocol: tcp
# published_port: 60002
# target_port: 60001
# - protocol: udp
# published_port: 60001
# target_port: 60001
# register: publish_3
#
- name: publish (idempotency)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
publish:
- protocol: udp
published_port: 60002
target_port: 60002
- published_port: 60001
target_port: 60001
register: publish_2
- name: publish (change)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
publish:
- protocol: tcp
published_port: 60002
target_port: 60003
- protocol: udp
published_port: 60001
target_port: 60001
register: publish_3
- name: publish (mode)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
publish:
- protocol: tcp
published_port: 60002
target_port: 60003
mode: host
- protocol: udp
published_port: 60001
target_port: 60001
mode: host
register: publish_4
- name: publish (mode idempotency)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
publish:
- protocol: udp
published_port: 60001
target_port: 60001
mode: host
- protocol: tcp
published_port: 60002
target_port: 60003
mode: host
register: publish_5
- assert:
that:
- publish_1 is changed
# - publish_2 is not changed
# - publish_3 is changed
- publish_2 is not changed
- publish_3 is changed
- publish_4 is changed
- publish_5 is not changed
when: docker_api_version is version('1.25', '>=')
- assert:
that: