Adjust deprecations (#1)

* First batch of c.g 2.0.0 deprecations.

* Remove use_tls and force from docker_image.

* More removals.

* Change community.general 3.0.0 deprecations to community.docker 2.0.0.

* Fix sanity.

* Fixing some bugs.

* Add PR URL to fragment.

ci_complete
ci_coverage

* Improve docs, remove superfluous code.
This commit is contained in:
Felix Fontein
2020-10-30 06:48:34 +01:00
parent 400c484a54
commit 5dba331bc7
21 changed files with 67 additions and 870 deletions
@@ -32,15 +32,6 @@
driver: json-file
register: logging_driver_2
- name: log_driver (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
log_driver: json-file
register: logging_driver_2b
- name: logging.driver (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -61,7 +52,6 @@
that:
- logging_driver_1 is changed
- logging_driver_2 is not changed
- logging_driver_2b is not changed
- logging_driver_3 is changed
####################################################################
@@ -94,18 +84,6 @@
labels: production_status
register: logging_options_2
- name: log_driver_options (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
log_driver: json-file
log_driver_options:
env: os,customer
labels: production_status
register: logging_options_2b
- name: logging_options (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -152,7 +130,6 @@
that:
- logging_options_1 is changed
- logging_options_2 is not changed
- logging_options_2b is not changed
- logging_options_3 is changed
- logging_options_4 is changed
- logging_options_5 is not changed
@@ -119,17 +119,6 @@
register: constraints_2
ignore_errors: yes
- name: constraints (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
constraints:
- "node.role == manager"
register: constraints_2b
ignore_errors: yes
- name: placement.constraints (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -200,7 +189,6 @@
that:
- constraints_1 is changed
- constraints_2 is not changed
- constraints_2b is not changed
- constraints_3 is changed
- constraints_4 is changed
- constraints_5 is not changed
@@ -32,15 +32,6 @@
cpus: 1
register: limit_cpu_2
- name: limit_cpu (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
limit_cpu: 1
register: limit_cpu_2b
- name: limits.cpus (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -61,7 +52,6 @@
that:
- limit_cpu_1 is changed
- limit_cpu_2 is not changed
- limit_cpu_2b is not changed
- limit_cpu_3 is changed
###################################################################
@@ -88,22 +78,14 @@
memory: 64M
register: limit_memory_2
- name: limit_memory (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
limit_memory: "67108864"
register: limit_memory_2b
- name: limits.memory (change)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
limit_memory: 32M
limits:
memory: 32M
register: limit_memory_3
- name: cleanup
@@ -116,7 +98,6 @@
that:
- limit_memory_1 is changed
- limit_memory_2 is not changed
- limit_memory_2b is not changed
- limit_memory_3 is changed
###################################################################
@@ -143,15 +124,6 @@
cpus: 1
register: reserve_cpu_2
- name: reserve_cpu (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
reserve_cpu: 1
register: reserve_cpu_2b
- name: reserve_cpu (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -172,7 +144,6 @@
that:
- reserve_cpu_1 is changed
- reserve_cpu_2 is not changed
- reserve_cpu_2b is not changed
- reserve_cpu_3 is changed
###################################################################
@@ -195,25 +166,18 @@
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
reserve_memory: 64M
reservations:
memory: 64M
register: reserve_memory_2
- name: reserve_memory (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
reserve_memory: "67108864"
register: reserve_memory_2b
- name: reservations.memory (change)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
reserve_memory: 32M
reservations:
memory: 32M
register: reserve_memory_3
- name: cleanup
@@ -226,5 +190,4 @@
that:
- reserve_memory_1 is changed
- reserve_memory_2 is not changed
- reserve_memory_2b is not changed
- reserve_memory_3 is changed
@@ -32,15 +32,6 @@
condition: "on-failure"
register: restart_policy_2
- name: restart_policy (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
restart_policy: "on-failure"
register: restart_policy_2b
- name: restart_config.condition (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -61,7 +52,6 @@
that:
- restart_policy_1 is changed
- restart_policy_2 is not changed
- restart_policy_2b is not changed
- restart_policy_3 is changed
###################################################################
@@ -88,15 +78,6 @@
max_attempts: 1
register: restart_policy_attempts_2
- name: restart_policy_attempts (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_attempts: 1
register: restart_policy_attempts_2b
- name: restart_config.max_attempts (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -117,7 +98,6 @@
that:
- restart_policy_attempts_1 is changed
- restart_policy_attempts_2 is not changed
- restart_policy_attempts_2b is not changed
- restart_policy_attempts_3 is changed
###################################################################
@@ -144,15 +124,6 @@
delay: 5s
register: restart_policy_delay_2
- name: restart_policy_delay (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_delay: 5000000000
register: restart_policy_delay_2b
- name: restart_config.delay (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -173,7 +144,6 @@
that:
- restart_policy_delay_1 is changed
- restart_policy_delay_2 is not changed
- restart_policy_delay_2b is not changed
- restart_policy_delay_3 is changed
###################################################################
@@ -200,15 +170,6 @@
window: 10s
register: restart_policy_window_2
- name: restart_policy_window (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
restart_policy_window: 10000000000
register: restart_policy_window_2b
- name: restart_config.window (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -229,5 +190,4 @@
that:
- restart_policy_window_1 is changed
- restart_policy_window_2 is not changed
- restart_policy_window_2b is not changed
- restart_policy_window_3 is changed
@@ -32,15 +32,6 @@
delay: 5s
register: update_delay_2
- name: update_delay (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_delay: 5000000000
register: update_delay_2b
- name: update_config.delay (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -61,7 +52,6 @@
that:
- update_delay_1 is changed
- update_delay_2 is not changed
- update_delay_2b is not changed
- update_delay_3 is changed
###################################################################
@@ -88,15 +78,6 @@
failure_action: "pause"
register: update_failure_action_2
- name: update_failure_action (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_failure_action: "pause"
register: update_failure_action_2b
- name: update_config.failure_action (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -138,7 +119,6 @@
that:
- update_failure_action_1 is changed
- update_failure_action_2 is not changed
- update_failure_action_2b is not changed
- update_failure_action_3 is changed
- assert:
@@ -179,16 +159,6 @@
register: update_max_failure_ratio_2
ignore_errors: yes
- name: update_max_failure_ratio (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_max_failure_ratio: 0.25
register: update_max_failure_ratio_2b
ignore_errors: yes
- name: update_config.max_failure_ratio (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -210,7 +180,6 @@
that:
- update_max_failure_ratio_1 is changed
- update_max_failure_ratio_2 is not changed
- update_max_failure_ratio_2b is not changed
- update_max_failure_ratio_3 is changed
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
- assert:
@@ -245,16 +214,6 @@
register: update_monitor_2
ignore_errors: yes
- name: update_monitor (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_monitor: 10s
register: update_monitor_2b
ignore_errors: yes
- name: update_config.monitor (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -276,7 +235,6 @@
that:
- update_monitor_1 is changed
- update_monitor_2 is not changed
- update_monitor_2b is not changed
- update_monitor_3 is changed
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
- assert:
@@ -311,16 +269,6 @@
register: update_order_2
ignore_errors: yes
- name: update_order (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_order: "start-first"
register: update_order_2b
ignore_errors: yes
- name: update_config.order (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -342,7 +290,6 @@
that:
- update_order_1 is changed
- update_order_2 is not changed
- update_order_2b is not changed
- update_order_3 is changed
when: docker_api_version is version('1.29', '>=') and docker_py_version is version('2.7.0', '>=')
- assert:
@@ -375,15 +322,6 @@
parallelism: 2
register: update_parallelism_2
- name: update_parallelism (idempotency, old name)
docker_swarm_service:
name: "{{ service_name }}"
image: alpine:3.8
resolve_image: no
command: '/bin/sh -v -c "sleep 10m"'
update_parallelism: 2
register: update_parallelism_2b
- name: update_config.parallelism (change)
docker_swarm_service:
name: "{{ service_name }}"
@@ -404,5 +342,4 @@
that:
- update_parallelism_1 is changed
- update_parallelism_2 is not changed
- update_parallelism_2b is not changed
- update_parallelism_3 is changed