Merge branch 'mergermarket-master'

README.md

@@ -12,6 +12,10 @@ On RedHat/CentOS, you may need to have EPEL installed before running this role.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    pip_package: python-pip
+
+The name of the packge to install to get `pip` on the system. You can set to `python3-pip`, for example, when using Python 3 on Ubuntu.
+
     pip_install_packages: []
 
 A list of packages to install with pip. Examples below:

defaults/main.yml

@@ -1,2 +1,5 @@
 ---
+# For Python 3, use python3-pip.
+pip_package: python-pip
+
 pip_install_packages: []

tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 - name: Ensure Pip is installed.
-  package: name=python-pip state=present
+  package:
+    name: "{{ pip_package }}"
+    state: present
 
 - name: Ensure pip_install_packages are installed.
   pip: