diff options
| author | Hannes Ljungberg <hannes@5monkeys.se> | 2019-03-07 23:51:59 +0100 |
|---|---|---|
| committer | Matt Martz <matt@sivel.net> | 2019-03-07 23:51:59 +0100 |
| commit | 3d07e7241acee311188a4a239578c27fc53778e8 (patch) | |
| tree | 18384d6e15f78b8eefbbcb49ab2b19e36035f53b /test/integration/targets/docker_swarm_service | |
| parent | win_domain: fix issue when running without credential delegation (#53480) (diff) | |
| download | ansible-3d07e7241acee311188a4a239578c27fc53778e8.tar.xz ansible-3d07e7241acee311188a4a239578c27fc53778e8.zip | |
docker_swarm_service: Documentation fixes (#53479)
* Document and validate mode choices
* Update examples
* Test cpu float values
* Test correct option
* Fix module return sample
* Add secrets and user to module return value
* Order options alphabetically
* Add changelog
* yaml indentation
* Revert "Order options alphabetically"
This reverts commit 51dabccda7930b707d5683670af7f89a68aeb577.
* Be consistent with choices type
Diffstat (limited to 'test/integration/targets/docker_swarm_service')
3 files changed, 6 insertions, 4 deletions
diff --git a/test/integration/targets/docker_swarm_service/tasks/tests/options.yml b/test/integration/targets/docker_swarm_service/tasks/tests/options.yml index e2ec0f79e9..4d4af36776 100644 --- a/test/integration/targets/docker_swarm_service/tasks/tests/options.yml +++ b/test/integration/targets/docker_swarm_service/tasks/tests/options.yml @@ -1106,7 +1106,7 @@ image: alpine:3.8 resolve_image: no command: '/bin/sh -v -c "sleep 10m"' - labels: {} + healthcheck: {} register: healthcheck_8 ignore_errors: yes @@ -1116,7 +1116,7 @@ image: alpine:3.8 resolve_image: no command: '/bin/sh -v -c "sleep 10m"' - labels: {} + healthcheck: {} register: healthcheck_9 ignore_errors: yes diff --git a/test/integration/targets/docker_swarm_service/tasks/tests/resources.yml b/test/integration/targets/docker_swarm_service/tasks/tests/resources.yml index c0a073d33e..03ccea93c9 100644 --- a/test/integration/targets/docker_swarm_service/tasks/tests/resources.yml +++ b/test/integration/targets/docker_swarm_service/tasks/tests/resources.yml @@ -48,7 +48,7 @@ resolve_image: no command: '/bin/sh -v -c "sleep 10m"' limits: - cpus: 2 + cpus: 0.5 register: limit_cpu_3 - name: cleanup @@ -159,7 +159,7 @@ resolve_image: no command: '/bin/sh -v -c "sleep 10m"' reservations: - cpus: 2 + cpus: 0.5 register: reserve_cpu_3 - name: cleanup diff --git a/test/integration/targets/docker_swarm_service/vars/main.yml b/test/integration/targets/docker_swarm_service/vars/main.yml index cfabafed9a..fd8c6932f3 100644 --- a/test/integration/targets/docker_swarm_service/vars/main.yml +++ b/test/integration/targets/docker_swarm_service/vars/main.yml @@ -26,6 +26,7 @@ service_expected_output: mode: global mounts: null networks: null + secrets: null stop_grace_period: null stop_signal: null placement_preferences: null @@ -46,4 +47,5 @@ service_expected_output: update_monitor: null update_order: null update_parallelism: null + user: null working_dir: null |