Python consistency changes

Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER Mischa ter Smitten <[email protected]>
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
   apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
 RUN rm -rf $HOME/.cache
 
 # ansible

README.md

@@ -13,7 +13,8 @@ Set up (the latest version of) virtualenv(wrapper) in Debian-like systems.
 
 #### Variables
 
-* `virtualenv_python_version` [default: `2`]: Python version to install `virtualenv` for.
+* `virtualenv_python_version_major` [default: `2`]: Python version to install `supervisor` for.
+* `virtualenv_python_version` [default: `virtualenv_python_version`]: Deprecated
 
 ## Dependencies
 

defaults/main.yml

@@ -1,3 +1,3 @@
-# defaults file for virtualenv
+# defaults file
 ---
 virtualenv_python_version: 2

handlers/main.yml

@@ -1,2 +1,2 @@
-# handlers file for virtualenv
+# handlers file
 ---

meta/main.yml

@@ -1,6 +1,7 @@
-# meta file for virtualenv
+# meta file
 ---
 galaxy_info:
+  namespace: oefenweb
   role_name: virtualenv
   author: Mischa ter Smitten
   company: Oefenweb.nl B.V.

tasks/main.yml

@@ -1,4 +1,4 @@
-# tasks file for virtualenv
+# tasks file
 ---
 - name: install dependencies
   apt:
@@ -16,7 +16,7 @@
   pip:
     name: "{{ virtualenv_pip_dependencies }}"
     state: latest
-    executable: "pip{{ virtualenv_python_version | string }}"
+    executable: "pip{{ virtualenv_python_version_major | string }}"
   tags:
     - configuration
     - virtualenv

tests/tasks/pre.yml

@@ -1,17 +1,17 @@
-# pre test file for virtualenv
+# pre test file
 ---
-- name: pre | install dependencies
+- name: install dependencies
   apt:
     name:
-      - "python{{ virtualenv_python_version is version('3', '>=') | ternary('3', '') }}"
+      - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
       - curl
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
 
-- name: pre | install pip
+- name: install pip
   shell: >
-    curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version | string }} -
+    curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version_major | string }} -
   args:
     warn: false
   changed_when: false

tests/test.yml

@@ -1,12 +1,18 @@
-# test file for virtualenv
+# test file
 ---
 - hosts: localhost
   connection: local
   become: true
   pre_tasks:
+    - name: include variables
+      include_vars: "{{ item }}"
+      with_first_found:
+        - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
+        - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
+        - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
       include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../
 #  vars:
-#    virtualenv_python_version: 3
+#    virtualenv_python_version_major: 3

tests/vagrant.yml

@@ -1,9 +1,15 @@
-# test file for virtualenv
+# test file
 ---
 - hosts: all
   remote_user: vagrant
   become: true
   pre_tasks:
+    - name: include variables
+      include_vars: "{{ item }}"
+      with_first_found:
+        - "{{ playbook_dir }}/vars/_{{ ansible_distribution_release }}.yml"
+        - "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
+        - "{{ playbook_dir }}/vars/_default.yml"
     - name: include tasks
       include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:

tests/vars/_default.yml

@@ -1,4 +1,4 @@
-# vars file for virtualenv
+# vars file
 ---
-virtualenv_python_version: 3
-virtualenv_get_pip_url: 'https://bootstrap.pypa.io/get-pip.py'
+virtualenv_python_version_major: 3
+virtualenv_get_pip_url: 'https://bootstrap.pypa.io/pip/get-pip.py'

tests/vars/_jessie.yml

@@ -1,4 +1,4 @@
-# vars file for virtualenv
+# vars file
 ---
-virtualenv_python_version: 2
-virtualenv_get_pip_url: 'https://bootstrap.pypa.io/2.7/get-pip.py'
+virtualenv_python_version_major: 2
+virtualenv_get_pip_url: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py'

tests/vars/_stretch.yml

@@ -1,4 +1,4 @@
-# vars file for virtualenv
+# vars file
 ---
-virtualenv_python_version: 2
-virtualenv_get_pip_url: 'https://bootstrap.pypa.io/2.7/get-pip.py'
+virtualenv_python_version_major: 2
+virtualenv_get_pip_url: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py'

tests/vars/_xenial.yml

@@ -1,4 +1,4 @@
-# vars file for pip
+# vars file
 ---
-virtualenv_python_version: 3
-virtualenv_get_pip_url: 'https://bootstrap.pypa.io/3.5/get-pip.py'
+virtualenv_python_version_major: 3
+virtualenv_get_pip_url: 'https://bootstrap.pypa.io/pip/3.5/get-pip.py'

vars/main.yml

@@ -1,7 +1,7 @@
-# vars file for virtualenv
+# vars file
 ---
 virtualenv_dependencies:
-  - "python{{ virtualenv_python_version is version('3', '>=') | ternary('3', '') }}"
+  - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
 
 virtualenv_pip_dependencies:
   - virtualenv