Skip to content

Commit

Permalink
Perform docker-py upgrade to docker prior to installing kolla
Browse files Browse the repository at this point in the history
  • Loading branch information
markgoddard committed Sep 20, 2017
1 parent 1b28351 commit e5b8ce6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ansible/roles/kolla/tasks/install.yml
Expand Up @@ -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' }}"
Expand All @@ -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 }}"

0 comments on commit e5b8ce6

Please sign in to comment.