From 63143ee91730ef0b8241cd412f7969868124202f Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 4 Nov 2016 17:01:16 +0000
Subject: [PATCH] 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: I7e81f4c7c6748c0d7dc4df6f968465f044027b6b
---
 meta/main.yml            |  2 +-
 tasks/glance_install.yml | 43 ++++++----------------------------------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 0c17e0c2..f917a3f7 100644
--- a/meta/main.yml
+++ b/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:
diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index 99c1b515..3ad0359e 100644
--- a/tasks/glance_install.yml
+++ b/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