Merge "Use updated get_url module checksum functionality"

meta/main.yml

@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of glance
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: Ubuntu
       versions:

tasks/glance_install.yml

@@ -44,49 +44,19 @@
   retries: 5
   delay: 2
 
-- name: Get local venv checksum
-  stat:
-    path: "/var/cache/{{ glance_venv_download_url | basename }}"
-    get_md5: False
-  when:
-    - not glance_developer_mode | bool
-  register: local_venv_stat
-
-- name: Get remote venv checksum
-  uri:
-    url: "{{ glance_venv_download_url | replace('tgz', 'checksum') }}"
-    return_content: True
-  when:
-    - not glance_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: "{{ glance_venv_download_url }}"
     dest: "/var/cache/{{ glance_venv_download_url | basename }}"
-    force: yes
-  failed_when: false
-  register: get_venv
-  when:
-    - not glance_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 glance get_venv fact
-  set_fact:
-    glance_get_venv: "{{ get_venv }}"
+    checksum: "sha1:{{ lookup('url', glance_venv_download_url | replace('tgz', 'checksum')) }}"
+  register: glance_get_venv
+  when: not glance_developer_mode | bool
 
 - name: Remove existing venv
   file:
     path: "{{ glance_bin | dirname }}"
     state: absent
-  when:
-    - glance_get_venv | changed
+  when: glance_get_venv | changed
 
 - name: Create glance venv dir
   file:
@@ -119,8 +89,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  when:
-    - glance_get_venv | failed or glance_developer_mode | bool
+  when: glance_developer_mode | bool
   notify:
     - Restart glance services
 
@@ -129,4 +98,4 @@
     virtualenv-tools --update-path=auto {{ glance_bin | dirname }}
   when:
     - not glance_developer_mode | bool
-    - glance_get_venv | success
+    - glance_get_venv | changed or glance_venv_dir | changed