Consistency changes

Oefenweb · Mar 15, 2021 · 86bbf38 · 86bbf38
1 parent 7eec35d
commit 86bbf38
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,4 +1,4 @@
-# defaults file for pip
+# defaults file
 ---
 pip_python_version_major: 2
 pip_python_version: "{{ pip_python_version_major }}"
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,2 +1,2 @@
-# handlers file for pip
+# handlers file
 ---
diff --git a/meta/main.yml b/meta/main.yml
@@ -1,4 +1,4 @@
-# meta file for pip
+# meta file
 ---
 galaxy_info:
   namespace: oefenweb

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,4 +1,4 @@
-# tasks file for pip
+# tasks file
 ---
 - name: install dependencies
   apt:
@@ -90,7 +90,7 @@
 - name: download (latest) pip
   get_url:
     url: "{{ pip_download_url }}"
-    dest: "{{ pip_download_path }}/{{ pip_download_url | basename }}-{{ pip_python_version | string }}"
+    dest: "{{ pip_download_path }}/{{ pip_download_url | basename }}-{{ pip_python_version_major | string }}"
     owner: root
     group: root
     mode: 0644

diff --git a/tests/test.yml b/tests/test.yml
@@ -1,4 +1,4 @@
-# test file for pip
+# test file
 ---
 - hosts: localhost
   connection: local

diff --git a/tests/vagrant.yml b/tests/vagrant.yml
@@ -1,4 +1,4 @@
-# test file for pip
+# test file
 ---
 - hosts: all
   remote_user: vagrant

diff --git a/tests/vars/_default.yml b/tests/vars/_default.yml
@@ -1,3 +1,3 @@
-# vars file for pip
+# vars file
 ---
 pip_python_version_major: 3
diff --git a/tests/vars/_jessie.yml b/tests/vars/_jessie.yml
@@ -1,3 +1,3 @@
-# vars file for pip
+# vars file
 ---
 pip_python_version_major: 2
diff --git a/tests/vars/_stretch.yml b/tests/vars/_stretch.yml
@@ -1,3 +1,3 @@
-# vars file for pip
+# vars file
 ---
 pip_python_version_major: 2
diff --git a/tests/vars/_xenial.yml b/tests/vars/_xenial.yml
@@ -1,3 +1,3 @@
-# vars file for pip
+# vars file
 ---
 pip_python_version_major: 2
diff --git a/vars/main.yml b/vars/main.yml
@@ -1,8 +1,8 @@
-# vars file for pip
+# vars file
 ---
 pip_dependencies:
-  - "python{{ pip_python_version is version('3', '>=') | ternary('3', '') }}"
-  - "python{{ pip_python_version is version('3', '>=') | ternary('3', '') }}-dev"
+  - "python{{ pip_python_version_major is version('3', '>=') | ternary('3', '') }}"
+  - "python{{ pip_python_version_major is version('3', '>=') | ternary('3', '') }}-dev"
   - curl
 
 pip_download_path: /var/lib/ansible/pip/downloads