Merge "Use updated get_url module checksum functionality"
This commit is contained in:
commit
fd3d729171
|
@ -3,7 +3,7 @@ galaxy_info:
|
|||
description: Deploy Barbican with OpenStack-Ansible
|
||||
company: OpenStack
|
||||
license: Apache-2.0
|
||||
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/{{ barbican_venv_download_url | basename }}"
|
||||
get_md5: False
|
||||
when:
|
||||
- not barbican_developer_mode | bool
|
||||
register: local_venv_stat
|
||||
|
||||
- name: Get remote venv checksum
|
||||
uri:
|
||||
url: "{{ barbican_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
return_content: True
|
||||
when:
|
||||
- not barbican_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: "{{ barbican_venv_download_url }}"
|
||||
dest: "/var/cache/{{ barbican_venv_download_url | basename }}"
|
||||
force: yes
|
||||
failed_when: false
|
||||
register: get_venv
|
||||
when:
|
||||
- not barbican_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 barbican get_venv fact
|
||||
set_fact:
|
||||
barbican_get_venv: "{{ get_venv }}"
|
||||
checksum: "sha1:{{ lookup('url', barbican_venv_download_url | replace('tgz', 'checksum')) }}"
|
||||
register: barbican_get_venv
|
||||
when: not barbican_developer_mode | bool
|
||||
|
||||
- name: Remove existing venv
|
||||
file:
|
||||
path: "{{ barbican_bin | dirname }}"
|
||||
state: absent
|
||||
when:
|
||||
- barbican_get_venv | changed
|
||||
when: barbican_get_venv | changed
|
||||
|
||||
- name: Create barbican venv dir
|
||||
file:
|
||||
|
@ -115,8 +85,7 @@
|
|||
until: install_packages|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
when:
|
||||
- barbican_get_venv | failed or barbican_developer_mode | bool
|
||||
when: barbican_developer_mode | bool
|
||||
notify: Restart barbican services
|
||||
|
||||
- name: Update virtualenv path
|
||||
|
@ -124,4 +93,4 @@
|
|||
virtualenv-tools --update-path=auto {{ barbican_bin | dirname }}
|
||||
when:
|
||||
- not barbican_developer_mode | bool
|
||||
- barbican_get_venv | success
|
||||
- barbican_get_venv | changed or barbican_venv_dir | changed
|
||||
|
|
Loading…
Reference in New Issue