Merge pull request #651 from bogdando/fix_docker_install

Fix download dnsmasq image dependency on docker
This commit is contained in:
Bogdan Dobrelya
2016-11-24 18:44:12 +01:00
committed by GitHub
3 changed files with 10 additions and 4 deletions

View File

@@ -2,4 +2,4 @@
dependencies:
- role: download
file: "{{ downloads.dnsmasq }}"
when: not skip_dnsmasq|default(false)
when: not skip_dnsmasq|default(false) and download_localhost|default(false)

View File

@@ -55,6 +55,7 @@
raw: sh -c "mkdir -p /opt/bin; ln -sf /usr/bin/python /opt/bin/python"
when: "{{ download_delegate == 'localhost' }}"
delegate_to: localhost
ignore_errors: true
run_once: true
- name: Download | create local directory for saved/loaded container images
@@ -103,7 +104,6 @@
delegate_to: "{{ download_delegate }}"
register: saved
run_once: true
become: false
when: (ansible_os_family != "CoreOS" or download_delegate == "localhost") and download_run_once|bool and download.enabled|bool and download.container|bool and (container_changed|bool or not img.stat.exists)
- name: Download | copy container images to ansible host