Use updated get_url module checksum functionality

Starting in Ansible 2.0, the get_url [1] module provides the
ability for a checksum to be provided to the get_url module
which will be verified against the local destination file
and the task skipped if it matches.

[1] http://docs.ansible.com/ansible/get_url_module.html

This patch implements the use of this functionality.

The ability to ignore a venv download failure is also removed
as this is not necessary or desirable. It is better for the
download to fail and the playbook execution to stop immediately
so that the failure point is exposed.

Change-Id: I22304c2d6b019fae8e4234548c3811cb8b1eb02f
This commit is contained in:
Jesse Pretorius 2016-11-07 12:58:36 +00:00 committed by Jesse Pretorius (odyssey4me)
parent ba39fc1731
commit 79b573451a
2 changed files with 6 additions and 36 deletions

View File

@ -18,7 +18,7 @@ galaxy_info:
description: Installation and setup of watcher description: Installation and setup of watcher
company: Walmart company: Walmart
license: Apache2 license: Apache2
min_ansible_version: 1.9 min_ansible_version: 2.0
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:

View File

@ -39,42 +39,13 @@
retries: 5 retries: 5
delay: 2 delay: 2
- name: Get local venv checksum
stat:
path: "/var/cache/{{ watcher_venv_download_url | basename }}"
get_md5: False
when:
- not watcher_developer_mode | bool
register: local_venv_stat
- name: Get remote venv checksum
uri:
url: "{{ watcher_venv_download_url | replace('tgz', 'checksum') }}"
return_content: True
when:
- not watcher_developer_mode | bool
register: remote_venv_checksum
# TODO: When project moves to ansible 2 we can pass this a sha256sum which will:
# a) allow us to remove force: yes
# b) allow the module to calculate the checksum of dest file which would
# result in file being downloaded only if provided and dest sha256sum
# checksums differ
- name: Attempt venv download - name: Attempt venv download
get_url: get_url:
url: "{{ watcher_venv_download_url }}" url: "{{ watcher_venv_download_url }}"
dest: "/var/cache/{{ watcher_venv_download_url | basename }}" dest: "/var/cache/{{ watcher_venv_download_url | basename }}"
force: yes checksum: "sha1:{{ lookup('url', watcher_venv_download_url | replace('tgz', 'checksum')) }}"
failed_when: false register: watcher_get_venv
register: get_venv when: not watcher_developer_mode | bool
when:
- not watcher_developer_mode | bool
- (local_venv_stat.stat.exists == False or
{{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }})
- name: Set watcher get_venv fact
set_fact:
watcher_get_venv: "{{ get_venv }}"
- name: Remove existing venv - name: Remove existing venv
file: file:
@ -117,8 +88,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
when: when: watcher_developer_mode | bool
- watcher_get_venv | failed or watcher_developer_mode | bool
notify: Restart watcher services notify: Restart watcher services
- name: Update virtualenv path - name: Update virtualenv path
@ -126,4 +96,4 @@
virtualenv-tools --update-path=auto {{ watcher_bin | dirname }} virtualenv-tools --update-path=auto {{ watcher_bin | dirname }}
when: when:
- not watcher_developer_mode | bool - not watcher_developer_mode | bool
- watcher_get_venv | success - watcher_get_venv | changed or watcher_venv_dir | changed