Skip to content

Commit 8a6a0df

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix prechecks with Docker 20.10.0" into stable/victoria
2 parents e31c69e + a591925 commit 8a6a0df

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ansible/roles/prechecks/tasks/service_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
changed_when: false
77
when: inventory_hostname in groups['baremetal']
88
failed_when: result is failed
9-
or result.stdout | regex_replace('.*(\\d+\\.\\d+\\.\\d+).*', '\\1') is version(docker_version_min, '<')
9+
or result.stdout | regex_replace('.*\\b(\\d+\\.\\d+\\.\\d+)\\b.*', '\\1') is version(docker_version_min, '<')
1010

1111
# NOTE(mgoddard): If passwords.yml is encrypted using ansible-vault, this check
1212
# will pass, but only because nothing in the vault file has the format of a
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with the ``kolla-ansible prechecks`` command with Docker
5+
20.10. `LP#1907436
6+
<https://bugs.launchpad.net/kolla-ansible/+bug/1907436>`__

0 commit comments

Comments
 (0)