diff options
| author | Felix Fontein <felix@fontein.de> | 2019-03-04 12:10:09 +0100 |
|---|---|---|
| committer | René Moser <mail@renemoser.net> | 2019-03-04 12:10:09 +0100 |
| commit | 8e26c2dfbe6b7cbfaf5fa3b2b5ce72d28a2e8319 (patch) | |
| tree | c8e98e28cc263273588762381c8db99deb8bb922 /test/integration/targets/docker_secret/tasks | |
| parent | New FortiManager Module: fmgr_secprof_appctrl (#53028) (diff) | |
| download | ansible-8e26c2dfbe6b7cbfaf5fa3b2b5ce72d28a2e8319.tar.xz ansible-8e26c2dfbe6b7cbfaf5fa3b2b5ce72d28a2e8319.zip | |
docker_swarm: support older docker-py versions (#53129)
* Decreasing docker_swarm requirements.
* Fixing docker-py / docker API version requirements, and some comments.
* Add changelog.
* Only send parameters specified by user to docker daemon.
* Extend labels test: not specifying == keep labels.
* Bump minimally required docker-py version for docker_node and docker_node_facts to 2.4.0.
* Prevent crashing when publish or healthcheck is not provided.
* Similarly to docker_swarm tests, only execute docker_node tests on real VMs and restart docker daemon when tests are done.
Diffstat (limited to 'test/integration/targets/docker_secret/tasks')
| -rw-r--r-- | test/integration/targets/docker_secret/tasks/main.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/targets/docker_secret/tasks/main.yml b/test/integration/targets/docker_secret/tasks/main.yml index 5ea5c36d7f..fe38bccdb2 100644 --- a/test/integration/targets/docker_secret/tasks/main.yml +++ b/test/integration/targets/docker_secret/tasks/main.yml @@ -1,6 +1,5 @@ - include_tasks: test_secrets.yml - # Maximum of 2.1.0 (docker-py version for docker_secrets) and 2.6.0 (docker-py version for docker_swarm) is 2.6.0 - when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=') + when: docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=') - fail: msg="Too old docker / docker-py version to run docker_secrets tests!" - when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) |