Rename python-pip packages to python2-pip for Red Hat like distros

README.md

@@ -21,7 +21,7 @@ sudo rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.n
 
 Install some important packages:
 ```bash
-sudo yum install python-pip gcc vim git
+sudo yum install python2-pip gcc vim git
 ```
 
 ### Debian family

salt/agentdriver/init.sls

@@ -7,10 +7,10 @@ agentdriver:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - ntp
       - incron
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - libmemcached-devel
       - python-devel
       - python-virtualenvwrapper
@@ -19,6 +19,7 @@ agentdriver:
       - libmemcached-dev
       - python-dev
       - virtualenvwrapper
+      - python-pip
       - zlib1g-dev
       {% endif %}
     - require_in:

salt/fwdriver/init.sls

@@ -11,6 +11,7 @@ firewall:
       - python-virtualenvwrapper
       - python-devel
       - libmemcached-devel
+      - python2-pip
       - dhcp
       {% else  %}
       - zlib1g-dev
@@ -18,6 +19,7 @@ firewall:
       - python-dev
       - libmemcached-dev
       - openvswitch-switch
+      - python-pip
       {% if grains['os'] != 'Debian' %}
       {# No such package in Debian Jessie! #}
       - openvswitch-controller
@@ -25,7 +27,6 @@ firewall:
       - isc-dhcp-server
       {% endif %}
       - git
-      - python-pip
       - ntp
       - iptables
       - ipset

salt/graphite/init.sls

@@ -7,13 +7,14 @@ graphite:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - ntp
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - pycairo
       - python-devel
       - python-virtualenvwrapper
       {% else %}
+      - python-pip
       - python-cairo
       - python-dev
       - virtualenvwrapper

salt/manager/init.sls

@@ -13,7 +13,6 @@ manager:
     - pkgs:
       - postgresql
       - git
-      - python-pip
       - ntp
       - rabbitmq-server
       - memcached
@@ -21,6 +20,7 @@ manager:
       - wget
       - swig
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - libffi-devel
       - openssl-devel
       - libmemcached-devel
@@ -32,6 +32,7 @@ manager:
       - python-devel
       - python-virtualenvwrapper
       {% else %}
+      - python-pip
       - libffi-dev
       - libssl-dev
       - libmemcached-dev

salt/monitor-client/init.sls

@@ -7,13 +7,14 @@ monitor-client:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - ntp
       - wget
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - python-devel
       - python-virtualenvwrapper
       {% else %}
+      - python-pip
       - python-dev
       - virtualenvwrapper
       {% endif %}

salt/storagedriver/init.sls

@@ -8,15 +8,16 @@ storagedriver:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - ntp
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - libmemcached-devel
       - python-devel
       - python-virtualenvwrapper
       - qemu-img
       - zlib-devel
       {% else %}
+      - python-pip
       - libmemcached-dev
       - python-dev
       - qemu-utils

salt/vmdriver/init.sls

@@ -8,12 +8,12 @@ vmdriver:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - python-augeas
       - ntp
       - wget
       - qemu-kvm
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - libmemcached-devel
       - libvirt
       - libvirt-daemon
@@ -26,6 +26,7 @@ vmdriver:
       - qemu-img
       - zlib-devel
       {% else %}
+      - python-pip
       - libmemcached-dev
       - libvirt-bin
       - libxml2-dev

salt/vncproxy/init.sls

@@ -7,15 +7,16 @@ vncproxy:
   pkg.installed:
     - pkgs:
       - git
-      - python-pip
       - ntp
       - wget
       {% if grains['os_family'] == 'RedHat' %}
+      - python2-pip
       - libffi-devel
       - openssl-devel
       - python-devel
       - python-virtualenvwrapper
       {% else %}
+      - python-pip
       - libffi-dev
       - libssl-dev
       - python-dev