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: I5869bee139a77613f96ca3528b760b45340effaa
This commit is contained in:
parent
7523f80f01
commit
30c51cd191
|
@ -18,7 +18,7 @@ galaxy_info:
|
|||
description: Installation and setup of heat
|
||||
company: Rackspace
|
||||
license: Apache2
|
||||
min_ansible_version: 1.9
|
||||
min_ansible_version: 2.0
|
||||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
|
|
|
@ -39,49 +39,19 @@
|
|||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Get local venv checksum
|
||||
stat:
|
||||
path: "/var/cache/{{ heat_venv_download_url | basename }}"
|
||||
get_md5: False
|
||||
when:
|
||||
- not heat_developer_mode | bool
|
||||
register: local_venv_stat
|
||||
|
||||
- name: Get remote venv checksum
|
||||
uri:
|
||||
url: "{{ heat_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: True
|
||||
when:
|
||||
- not heat_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
|
||||
get_url:
|
||||
url: "{{ heat_venv_download_url }}"
|
||||
dest: "/var/cache/{{ heat_venv_download_url | basename }}"
|
||||
force: yes
|
||||
failed_when: false
|
||||
register: get_venv
|
||||
when:
|
||||
- not heat_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 heat get_venv fact
|
||||
set_fact:
|
||||
heat_get_venv: "{{ get_venv }}"
|
||||
checksum: "sha1:{{ lookup('url', heat_venv_download_url | replace('tgz', 'checksum')) }}"
|
||||
register: heat_get_venv
|
||||
when: not heat_developer_mode | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ heat_bin | dirname }}"
|
||||
state: absent
|
||||
when:
|
||||
- heat_get_venv | changed
|
||||
when: heat_get_venv | changed
|
||||
|
||||
- name: Create heat venv dir
|
||||
file:
|
||||
|
@ -113,8 +83,7 @@
|
|||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- heat_get_venv | failed or heat_developer_mode | bool
|
||||
when: heat_developer_mode | bool
|
||||
notify: Restart heat services
|
||||
|
||||
- name: Update virtualenv path
|
||||
|
@ -122,4 +91,4 @@
|
|||
virtualenv-tools --update-path=auto {{ heat_bin | dirname }}
|
||||
when:
|
||||
- not heat_developer_mode | bool
|
||||
- heat_get_venv | success
|
||||
- heat_get_venv | changed or heat_venv_dir | changed
|
||||
|
|
Loading…
Reference in New Issue