openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix prechecks with Docker 20.10.0"

Browse Source
This commit is contained in:
Zuul
2020-12-11 11:20:27 +00:00
committed by Gerrit Code Review
parent 90d0900e82 b60b0d5878
commit 1437ba2d1b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/prechecks/tasks/service_checks.yml
View File

@@ -6,7 +6,7 @@
changed_when: false changed_when: false
when: inventory_hostname in groups['baremetal'] when: inventory_hostname in groups['baremetal']
failed_when: result is failed failed_when: result is failed
or result.stdout | regex_replace('.*(\\d+\\.\\d+\\.\\d+).*', '\\1') is version(docker_version_min, '<') or result.stdout | regex_replace('.*\\b(\\d+\\.\\d+\\.\\d+)\\b.*', '\\1') is version(docker_version_min, '<')
# NOTE(mgoddard): If passwords.yml is encrypted using ansible-vault, this check # NOTE(mgoddard): If passwords.yml is encrypted using ansible-vault, this check
# will pass, but only because nothing in the vault file has the format of a # will pass, but only because nothing in the vault file has the format of a

6
releasenotes/notes/bug-1907436-2da50ed38d107127.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with the ``kolla-ansible prechecks`` command with Docker
20.10. `LP#1907436
<https://bugs.launchpad.net/kolla-ansible/+bug/1907436>`__