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: I8b7b76521d38c0dd842c32545644fe43129c0354
This commit is contained in:
Jesse Pretorius 2016-11-07 11:12:05 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 86f6e8d8a5
commit 6bd95f1b68
2 changed files with 7 additions and 38 deletions

View File

@ -17,7 +17,7 @@ galaxy_info:
description: Baremetal provisioning for Openstack description: Baremetal provisioning for Openstack
company: OpenStack company: OpenStack
license: Apache license: Apache
min_ansible_version: 1.9 min_ansible_version: 2.0
platforms: platforms:
- name: Ubuntu - name: Ubuntu
versions: versions:

View File

@ -42,49 +42,19 @@
retries: 5 retries: 5
delay: 2 delay: 2
- name: Get local venv checksum
stat:
path: "/var/cache/{{ ironic_venv_download_url | basename }}"
get_md5: False
when:
- not ironic_developer_mode | bool
register: local_venv_stat
- name: Get remote venv checksum
uri:
url: "{{ ironic_venv_download_url | replace('tgz', 'checksum') }}"
return_content: True
when:
- not ironic_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: "{{ ironic_venv_download_url }}" url: "{{ ironic_venv_download_url }}"
dest: "/var/cache/{{ ironic_venv_download_url | basename }}" dest: "/var/cache/{{ ironic_venv_download_url | basename }}"
force: yes checksum: "sha1:{{ lookup('url', ironic_venv_download_url | replace('tgz', 'checksum')) }}"
failed_when: false register: ironic_get_venv
register: get_venv when: not ironic_developer_mode | bool
when:
- not ironic_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 ironic get_venv fact
set_fact:
ironic_get_venv: "{{ get_venv }}"
- name: Remove existing venv - name: Remove existing venv
file: file:
path: "{{ ironic_bin | dirname }}" path: "{{ ironic_bin | dirname }}"
state: absent state: absent
when: when: ironic_get_venv | changed
- ironic_get_venv | changed
- name: Create ironic venv dir - name: Create ironic venv dir
file: file:
@ -116,8 +86,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
when: when: ironic_developer_mode | bool
- ironic_get_venv | failed or ironic_developer_mode | bool
notify: Restart ironic services notify: Restart ironic services
- name: Update virtualenv path - name: Update virtualenv path
@ -125,4 +94,4 @@
virtualenv-tools --update-path=auto {{ ironic_bin | dirname }} virtualenv-tools --update-path=auto {{ ironic_bin | dirname }}
when: when:
- not ironic_developer_mode | bool - not ironic_developer_mode | bool
- ironic_get_venv | success - ironic_get_venv | changed or ironic_venv_dir | changed