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: If1dd3fde47871c1201fb50759432a511a6f5fbce
This commit is contained in:
parent
320e0e6e06
commit
bd33f3d412
@ -18,7 +18,7 @@ galaxy_info:
|
||||
description: Installation and setup of keystone
|
||||
company: Rackspace
|
||||
license: Apache2
|
||||
min_ansible_version: 1.9
|
||||
min_ansible_version: 2.0
|
||||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
|
@ -54,57 +54,26 @@
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Get local venv checksum
|
||||
stat:
|
||||
path: "/var/cache/{{ keystone_venv_download_url | basename }}"
|
||||
get_md5: False
|
||||
when:
|
||||
- not keystone_developer_mode | bool
|
||||
register: local_venv_stat
|
||||
|
||||
- name: Get remote venv checksum
|
||||
uri:
|
||||
url: "{{ keystone_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: True
|
||||
when:
|
||||
- not keystone_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: "{{ keystone_venv_download_url }}"
|
||||
dest: "/var/cache/{{ keystone_venv_download_url | basename }}"
|
||||
force: yes
|
||||
failed_when: false
|
||||
register: get_venv
|
||||
when:
|
||||
- not keystone_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 keystone get_venv fact
|
||||
set_fact:
|
||||
keystone_get_venv: "{{ get_venv }}"
|
||||
checksum: "sha1:{{ lookup('url', keystone_venv_download_url | replace('tgz', 'checksum')) }}"
|
||||
register: keystone_get_venv
|
||||
when: not keystone_developer_mode | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ keystone_bin | dirname }}"
|
||||
state: absent
|
||||
when:
|
||||
- keystone_get_venv | changed
|
||||
when: keystone_get_venv | changed
|
||||
|
||||
- name: Create keystone venv dir
|
||||
file:
|
||||
path: "{{ keystone_bin | dirname }}"
|
||||
state: directory
|
||||
register: keystone_venv_dir
|
||||
when:
|
||||
- not keystone_developer_mode | bool
|
||||
when: not keystone_developer_mode | bool
|
||||
|
||||
- name: Unarchive pre-built venv
|
||||
unarchive:
|
||||
@ -132,8 +101,7 @@
|
||||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- keystone_get_venv | failed or keystone_developer_mode | bool
|
||||
when: keystone_developer_mode | bool
|
||||
notify:
|
||||
- Restart Keystone APIs
|
||||
- Restart service
|
||||
@ -143,4 +111,4 @@
|
||||
virtualenv-tools --update-path=auto {{ keystone_bin | dirname }}
|
||||
when:
|
||||
- not keystone_developer_mode | bool
|
||||
- keystone_get_venv | success
|
||||
- keystone_get_venv | changed or keystone_venv_dir | changed
|
||||
|
Loading…
x
Reference in New Issue
Block a user