WIP: Drop Ansible 1.x support (DavidWittman#183)

* Update README to remove Ansible 1.x support

* Remove 1.x from .travis.yml testing

* Fix downloading for 2.x only

* Add Ansible 1.x check

* Update comment for `else omit` in dependencies

* Add 2.1.6 back to testing matrix

Author: DavidWittman

.travis.yml

@@ -3,8 +3,8 @@ language: python
 python: "2.7"
 
 env:
-  - ANSIBLE_VERSION=1.9.4
-  - ANSIBLE_VERSION=2.1.3
+  - ANSIBLE_VERSION=2.1.6
+  - ANSIBLE_VERSION=2.3.3
   - ANSIBLE_VERSION=latest
 
 before_install:

README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/DavidWittman/ansible-redis.svg?branch=master)](https://travis-ci.org/DavidWittman/ansible-redis) [![Ansible Galaxy](https://img.shields.io/badge/galaxy-DavidWittman.redis-blue.svg?style=flat)](https://galaxy.ansible.com/detail#/role/730)
 
  - Ansible 2.1+
-   - Ansible 1.9.x is currently supported, but it will be deprecated soon
  - Compatible with most versions of Ubuntu/Debian and RHEL/CentOS 6.x
 
 ## Contents
@@ -151,23 +150,7 @@ Along with the variables listed above, Sentinel has a number of its own configur
 
 ### Verifying checksums
 
-Set the `redis_verify_checksum` variable to true to use the checksum verification option for `get_url`. Note that this will only verify checksums when Redis is downloaded from a URL, not when one is provided in a tarball with `redis_tarball`. Due to differences in the `get_url` module in Ansible 1.x and Ansible 2.x, this feature behaves differently depending on the version of Ansible which you are using.
-
-#### Ansible 1.x
-
-In Ansible 1.x, the `get_url` module only supports verifying sha256 checksums, which are not provided by default. If you wish to set `redis_verify_checksum`, you must also define a sha256 checksum with the `redis_checksum` variable.
-
-``` yaml
-- name: install redis on ansible 1.x and verify checksums
-  hosts: all
-  roles:
-    - role: DavidWittman.redis
-      redis_version: 3.0.7
-      redis_verify_checksum: true
-      redis_checksum: b2a791c4ea3bb7268795c45c6321ea5abcc24457178373e6a6e3be6372737f23
-```
-
-#### Ansible 2.x
+Set the `redis_verify_checksum` variable to true to use the checksum verification option for `get_url`. Note that this will only verify checksums when Redis is downloaded from a URL, not when one is provided in a tarball with `redis_tarball`.
 
 When using Ansible 2.x, this role will verify the sha1 checksum of the download against checksums defined in the `redis_checksums` variable in `vars/main.yml`. If your version is not defined in here or you wish to override the checksum with one of your own, simply set the `redis_checksum` variable. As in the example below, you will need to prefix the checksum with the type of hash which you are using.
 

tasks/check_vars.yml

@@ -1,23 +1,20 @@
 ---
-# Checksums for Ansible 1.x must be sha256
-- name: check for checksum (ansible 1.x)
+
+- name: check for ansible 1.x
   fail:
     msg: >
-      A sha256 checksum must be provided for Ansible 1.x when
-      redis_verify_checksum is set to true.
+      This role no longer supports Ansible 1.x. The last known good tag
+      for Ansible 1.x support in this role is 1.2.5.
   when:
     - ansible_version.major < 2
-    - redis_verify_checksum|bool
-    - redis_checksum is not defined or redis_checksum|length != 64
 
-- name: check for checksum (ansible 2.x)
+- name: check for checksum
   fail:
     msg: >
       There is no sha1 checksum defined for version {{ redis_version }} in
       vars/main.yml. Set redis_checksum manually or submit a PR to add this
       version.
   when:
-    - ansible_version.major >= 2
     - redis_verify_checksum|bool
     - redis_checksum is not defined
     - redis_version not in redis_checksums

tasks/dependencies.yml

@@ -9,7 +9,7 @@
     - gcc
     - make
     - libc6-dev
-    # This should be `else omit`, but it fails on Ansible 1.x, so just duplicate gcc
+    # This should be `else omit`, but that doesn't quite work, so duplicate gcc
     - "{{ 'libc6-dev-i386' if redis_make_32bit|bool else 'gcc' }}"
   when: ansible_os_family == "Debian"
 
@@ -47,7 +47,7 @@
   with_items:
     - gcc
     - make
-    # This should be `else omit`, but it fails on Ansible 1.x, so just duplicate gcc
+    # These should be `else omit`, but that doesn't quite work, so duplicate gcc
     - "{{ 'gcc-32bit' if redis_make_32bit|bool else 'gcc' }}"
     - "{{ 'libgcc_s1-32bit' if redis_make_32bit|bool else 'gcc' }}"
   when: ansible_os_family == 'Suse'

tasks/download.yml

@@ -1,33 +1,21 @@
 ---
 
-# get_url on Ansible 1.x only supports sha256 checksumming, so we're only
-# using `redis_checksums` on Ansible 2.x because they're sha1.
+# Redis uses a mix of sha1 and sha256 checksums.
+# Determine the type of checksum based on its length and prefix the variable appropriately
 - name: set redis checksum
   set_fact:
     redis_checksum: "{{ 'sha1' if redis_checksums[redis_version]|length == 40 else 'sha256' }}:{{ redis_checksums[redis_version] }}"
   when:
     - redis_verify_checksum|bool
     - redis_checksum is not defined
     - redis_version in redis_checksums
-    - ansible_version.major >= 2
 
-- name: download redis (ansible 1.x)
-  get_url:
-    url: "{{ redis_download_url }}"
-    dest: /usr/local/src/redis-{{ redis_version }}.tar.gz
-    sha256sum: "{{ redis_checksum|default(omit) }}"
-  when:
-    - not redis_tarball
-    - ansible_version.major < 2
-
-- name: download redis (ansible 2.x)
+- name: download redis
   get_url:
     url: "{{ redis_download_url }}"
     dest: /usr/local/src/redis-{{ redis_version }}.tar.gz
     checksum: "{{ redis_checksum|default(omit) }}"
-  when:
-    - not redis_tarball
-    - ansible_version.major >= 2
+  when: not redis_tarball
 
 - name: upload redis
   copy: