openstack/kolla-ansible
Code Issues Proposed changes

Fix prechecks with Docker 20.10.0

Browse Source 
The 'prechecks : Checking Docker version' task previously failed with
Docker 20.10.0. The regex used to parse the version was returning
0.10.0, which is not above the minimum. The previous version of 19.x
would have been parsed as 9.x, which is above the minimum.

This change fixes the issue by matching the beginning and end of the
version using \b.

Depends-On: https://review.opendev.org/766183

Change-Id: I2a23eea7effb5b9a5e73361bcd48bd2e16d1569c
Closes-Bug: 1907436
This commit is contained in:
Mark Goddard 2020-12-09 12:24:11 +00:00
parent ace3562f2e
commit b60b0d5878
2 changed files with 7 additions and 1 deletions
Show Stats 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>`__