openstack/kolla-ansible
Code Issues Proposed changes

Merge "Removal of dockerSDK check for other container engines"

Browse Source
This commit is contained in:
Zuul 2022-11-29 14:00:35 +00:00 committed by Gerrit Code Review
commit de7d9c237c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,9 @@
command: "{{ ansible_facts.python.executable }} -c \"import docker; print(docker.__version__)\"" command: "{{ ansible_facts.python.executable }} -c \"import docker; print(docker.__version__)\""
register: result register: result
changed_when: false changed_when: false
when: inventory_hostname in groups['baremetal'] when:
- inventory_hostname in groups['baremetal']
- kolla_container_engine == 'docker'
failed_when: result is failed or result.stdout is version(docker_py_version_min, '<') failed_when: result is failed or result.stdout is version(docker_py_version_min, '<')
# NOTE(osmanlicilegi): ansible_version.full includes patch number that's useless # NOTE(osmanlicilegi): ansible_version.full includes patch number that's useless

2
ansible/roles/swift/tasks/reconfigure.yml
View File

@ -44,7 +44,7 @@
- name: Check the configs - name: Check the configs
become: true become: true
command: "{{ kolla_container_engine }}exec -u root {{ item.name }} /usr/local/bin/kolla_set_configs --check" command: "{{ kolla_container_engine }} exec -u root {{ item.name }} /usr/local/bin/kolla_set_configs --check"
changed_when: false changed_when: false
failed_when: false failed_when: false
register: check_results register: check_results