openstack/kayobe
Code Issues Proposed changes

Perform docker-py upgrade to docker prior to installing kolla

Browse Source
This commit is contained in:
Mark Goddard 2017-09-20 16:12:36 +01:00
parent 1b28351534
commit e5b8ce6cbf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/kolla/tasks/install.yml
View File

@ -49,6 +49,11 @@
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
virtualenv: "{{ kolla_venv }}" virtualenv: "{{ kolla_venv }}"
with_items: with_items:
# In version 2.0.0, docker renamed the docker-py python package to docker.
# Kolla requires the docker package rather than the docker-py package.
- name: docker-py
state: absent
- name: docker
# Intall Kolla from source. # Intall Kolla from source.
- name: "{{ kolla_source_path }}" - name: "{{ kolla_source_path }}"
install: "{{ kolla_ctl_install_type == 'source' }}" install: "{{ kolla_ctl_install_type == 'source' }}"
@ -59,9 +64,4 @@
# Required for kolla-genpwd. # Required for kolla-genpwd.
- name: PyYAML - name: PyYAML
version: "3.12" version: "3.12"
# In version 2.0.0, docker renamed the docker-py python package to docker.
# Kolla requires the docker package rather than the docker-py package.
- name: docker-py
state: absent
- name: docker
when: "{{ item.install | default(True) | bool }}" when: "{{ item.install | default(True) | bool }}"