mirror of
https://github.com/ansible-collections/community.docker.git
synced 2026-07-29 11:55:04 +00:00
Implement all remaining deprecations for 3.0.0 (#400)
* Remove support for Ansible 2.9 and ansible-base 2.10. * Remove Ansible 2.9 compatiblity code. * Remove docker-compose from EE. * Drop support for Python 2.6. Stop advertising docker-py for Python 2.6. * Drop support for API versions 1.20 to 1.24. * Fix condition.
This commit is contained in:
Felix Fontein
GitHub
@@ -73,7 +73,6 @@
|
||||
state: absent
|
||||
force: yes
|
||||
ignore_errors: yes
|
||||
# Maximum of 1.24 (docker API version for docker_swarm_service) and 1.25 (docker API version for docker_swarm) is 1.25
|
||||
when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!"
|
||||
|
||||
@@ -110,4 +110,4 @@
|
||||
that:
|
||||
- output is success
|
||||
- output is changed
|
||||
when: docker_api_version is version('1.24', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
|
||||
@@ -319,12 +319,12 @@
|
||||
- dns_4 is changed
|
||||
- dns_5 is changed
|
||||
- dns_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_1 is failed
|
||||
- "'Minimum version required' in dns_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## dns_options #####################################################
|
||||
@@ -412,12 +412,12 @@
|
||||
- dns_options_4 is not changed
|
||||
- dns_options_5 is changed
|
||||
- dns_options_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_options_1 is failed
|
||||
- "'Minimum version required' in dns_options_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## dns_search ######################################################
|
||||
@@ -505,12 +505,12 @@
|
||||
- dns_search_4 is changed
|
||||
- dns_search_5 is changed
|
||||
- dns_search_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_search_1 is failed
|
||||
- "'Minimum version required' in dns_search_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## endpoint_mode ###################################################
|
||||
@@ -557,12 +557,12 @@
|
||||
- endpoint_mode_1 is changed
|
||||
- endpoint_mode_2 is not changed
|
||||
- endpoint_mode_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_py_version is version('3.0.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- endpoint_mode_1 is failed
|
||||
- "'Minimum version required' in endpoint_mode_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('3.0.0', '<')
|
||||
when: docker_py_version is version('3.0.0', '<')
|
||||
|
||||
####################################################################
|
||||
## env #############################################################
|
||||
@@ -800,12 +800,12 @@
|
||||
that:
|
||||
- force_update_1 is changed
|
||||
- force_update_2 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- force_update_1 is failed
|
||||
- "'Minimum version required' in force_update_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
####################################################################
|
||||
## groups ##########################################################
|
||||
@@ -892,12 +892,12 @@
|
||||
- groups_4 is changed
|
||||
- groups_5 is changed
|
||||
- groups_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- groups_1 is failed
|
||||
- "'Minimum version required' in groups_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## healthcheck #####################################################
|
||||
@@ -1091,12 +1091,12 @@
|
||||
- hostname_1 is changed
|
||||
- hostname_2 is not changed
|
||||
- hostname_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.2.0', '>=')
|
||||
when: docker_py_version is version('2.2.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- hostname_1 is failed
|
||||
- "'Minimum version required' in hostname_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.2.0', '<')
|
||||
when: docker_py_version is version('2.2.0', '<')
|
||||
|
||||
###################################################################
|
||||
## hosts ##########################################################
|
||||
@@ -1148,12 +1148,12 @@
|
||||
- hosts_1 is changed
|
||||
- hosts_2 is not changed
|
||||
- hosts_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- hosts_1 is failed
|
||||
- "'Minimum version required' in hosts_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
|
||||
###################################################################
|
||||
@@ -1587,12 +1587,12 @@
|
||||
- (publish_8_info.service.Endpoint.Ports | length) == 2
|
||||
- publish_9 is changed
|
||||
- publish_10 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_py_version is version('3.0.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- publish_1 is failed
|
||||
- "'Minimum version required' in publish_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('3.0.0', '<')
|
||||
when: docker_py_version is version('3.0.0', '<')
|
||||
|
||||
###################################################################
|
||||
## read_only ######################################################
|
||||
@@ -1784,12 +1784,12 @@
|
||||
- tty_1 is changed
|
||||
- tty_2 is not changed
|
||||
- tty_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- tty_1 is failed
|
||||
- "'Minimum version required' in tty_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
###################################################################
|
||||
## user ###########################################################
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
data: "secret1"
|
||||
state: "present"
|
||||
register: "secret_result_1"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
- docker_secret:
|
||||
name: "{{ secret_name_2 }}"
|
||||
data: "secret2"
|
||||
state: "present"
|
||||
register: "secret_result_2"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
- docker_secret:
|
||||
name: "{{ secret_name_3 }}"
|
||||
@@ -31,7 +31,7 @@
|
||||
state: "present"
|
||||
rolling_versions: true
|
||||
register: "secret_result_3"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
####################################################################
|
||||
## secrets #########################################################
|
||||
@@ -159,7 +159,7 @@
|
||||
state: "present"
|
||||
rolling_versions: true
|
||||
register: secrets_10
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
ignore_errors: yes
|
||||
|
||||
- name: rolling secrets service update
|
||||
@@ -193,12 +193,12 @@
|
||||
- secrets_9 is changed
|
||||
- secrets_10 is not failed
|
||||
- secrets_11 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (uid) ###################################################
|
||||
@@ -282,12 +282,12 @@
|
||||
- secrets_3 is changed
|
||||
- secrets_4 is changed
|
||||
- secrets_5 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (gid) ###################################################
|
||||
@@ -371,12 +371,12 @@
|
||||
- secrets_3 is changed
|
||||
- secrets_4 is changed
|
||||
- secrets_5 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (mode) ##################################################
|
||||
@@ -432,12 +432,12 @@
|
||||
- secrets_1 is changed
|
||||
- secrets_2 is not changed
|
||||
- secrets_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
####################################################################
|
||||
@@ -455,4 +455,4 @@
|
||||
loop_control:
|
||||
loop_var: secret_name
|
||||
ignore_errors: yes
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
@@ -183,12 +183,12 @@
|
||||
- update_max_failure_ratio_1 is changed
|
||||
- update_max_failure_ratio_2 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', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- update_max_failure_ratio_1 is failed
|
||||
- "'Minimum version required' in update_max_failure_ratio_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
###################################################################
|
||||
# update_config.monitor ###########################################
|
||||
@@ -238,12 +238,12 @@
|
||||
- update_monitor_1 is changed
|
||||
- update_monitor_2 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', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- update_monitor_1 is failed
|
||||
- "'Minimum version required' in update_monitor_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
###################################################################
|
||||
# update_config.order #############################################
|
||||
|
||||
Reference in New Issue
Block a user