openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix prechecks fail with docker not in deployment host"

Browse Source
This commit is contained in:
Jenkins 2017-09-20 16:33:43 +00:00 committed by Gerrit Code Review
commit 641a7f2790
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/prechecks/tasks/package_checks.yml
View File

@ -3,6 +3,7 @@
command: "{{ ansible_python.executable }} -c \"import docker; print docker.__version__\"" command: "{{ ansible_python.executable }} -c \"import docker; print docker.__version__\""
register: result register: result
changed_when: false changed_when: false
when: inventory_hostname in groups['baremetal']
failed_when: result | failed or failed_when: result | failed or
result.stdout | version_compare(docker_py_version_min, '<') result.stdout | version_compare(docker_py_version_min, '<')

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

@ -3,6 +3,7 @@
command: docker version command: docker version
register: result register: result
changed_when: false changed_when: false
when: inventory_hostname in groups['baremetal']
failed_when: result | failed failed_when: result | failed
or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<') or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<')