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: Iac9b677db744167a1bb010ba659dc0d833dec772
This commit is contained in:
parent
9546fc407f
commit
60f724caeb
|
@ -18,7 +18,7 @@ galaxy_info:
|
|||
description: Installation and setup of ceilometer
|
||||
company: Rackspace
|
||||
license: Apache2
|
||||
min_ansible_version: 1.9
|
||||
min_ansible_version: 2.0
|
||||
platforms:
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
|
|
|
@ -39,50 +39,19 @@
|
|||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Get local venv checksum
|
||||
stat:
|
||||
path: "/var/cache/{{ ceilometer_venv_download_url | basename }}"
|
||||
get_md5: False
|
||||
when:
|
||||
- not ceilometer_developer_mode | bool
|
||||
register: local_venv_stat
|
||||
|
||||
- name: Get remote venv checksum
|
||||
uri:
|
||||
url: "{{ ceilometer_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: True
|
||||
when:
|
||||
- not ceilometer_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: "{{ ceilometer_venv_download_url }}"
|
||||
dest: "/var/cache/{{ ceilometer_venv_download_url | basename }}"
|
||||
force: yes
|
||||
failed_when: false
|
||||
register: get_venv
|
||||
when:
|
||||
- not ceilometer_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 ceilometer get_venv fact
|
||||
set_fact:
|
||||
ceilometer_get_venv: "{{ get_venv }}"
|
||||
checksum: "sha1:{{ lookup('url', ceilometer_venv_download_url | replace('tgz', 'checksum')) }}"
|
||||
register: ceilometer_get_venv
|
||||
when: not ceilometer_developer_mode | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ ceilometer_bin | dirname }}"
|
||||
state: absent
|
||||
when:
|
||||
- not ceilometer_developer_mode | bool
|
||||
- ceilometer_get_venv | changed
|
||||
when: ceilometer_get_venv | changed
|
||||
|
||||
- name: Create ceilometer venv dir
|
||||
file:
|
||||
|
@ -117,8 +86,7 @@
|
|||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- ceilometer_get_venv | failed or ceilometer_developer_mode | bool
|
||||
when: ceilometer_developer_mode | bool
|
||||
notify: Restart ceilometer services
|
||||
|
||||
- name: Update virtualenv path
|
||||
|
@ -126,4 +94,4 @@
|
|||
virtualenv-tools --update-path=auto {{ ceilometer_bin | dirname }}
|
||||
when:
|
||||
- not ceilometer_developer_mode | bool
|
||||
- ceilometer_get_venv | success
|
||||
- ceilometer_get_venv | changed or ceilometer_venv_dir | changed
|
||||
|
|
Loading…
Reference in New Issue