Browse Source

fix docker-storage-setup run conditions

master
Nicolas Massé 9 years ago
parent
commit
edf36056b2
  1. 13
      roles/docker/tasks/main.yml

13
roles/docker/tasks/main.yml

@ -21,21 +21,14 @@
service: name=docker state=started service: name=docker state=started
tags: docker-storage tags: docker-storage
# TODO : on fresh install, run docker-storage-setup inconditionally
- name: Determine if docker storage driver == devicemapper - name: Determine if docker storage driver == devicemapper
shell: docker info | grep 'Storage Driver:.*devicemapper' shell: docker info
register: correct_storage_driver register: docker_info
changed_when: false changed_when: false
ignore_errors: yes
- debug:
var: correct_storage_driver
- name: set docker_storage_setup_needs_to_run - name: set docker_storage_setup_needs_to_run
set_fact: set_fact:
docker_storage_setup_needs_to_run: '{{ correct_storage_driver.rc == 1 }}' docker_storage_setup_needs_to_run: '{{ docker_info.stdout.find(''Storage Driver: devicemapper'') == -1 or docker_info.stdout.find(''Data file: /dev/loop'') != -1 }}'
tags: docker-storage tags: docker-storage
- name: stop docker - name: stop docker

Loading…
Cancel
Save