Skip to content

CIRCLE / salt

Go to a project
Commit 8c57ec2d by Czémán Arnold
Options

Merge branch 'issue_22' into 'master' 

Red Hat python-pip to python2-pip

See merge request !7
parents a0a63826 4c2e2593
Showing with 17 additions and 9 deletions
README.md
...@@ -21,7 +21,7 @@ sudo rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.n ...@@ -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: Install some important packages:
```bash ```bash
sudo yum install python-pip gcc vim git sudo yum install python2-pip gcc vim git
``` ```
### Debian family ### Debian family
......
salt/agentdriver/init.sls
...@@ -7,10 +7,10 @@ agentdriver: ...@@ -7,10 +7,10 @@ agentdriver:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- ntp - ntp
- incron - incron
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libmemcached-devel - libmemcached-devel
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
...@@ -19,6 +19,7 @@ agentdriver: ...@@ -19,6 +19,7 @@ agentdriver:
- libmemcached-dev - libmemcached-dev
- python-dev - python-dev
- virtualenvwrapper - virtualenvwrapper
- python-pip
- zlib1g-dev - zlib1g-dev
{% endif %} {% endif %}
- require_in: - require_in:
......
salt/fwdriver/init.sls
...@@ -11,6 +11,7 @@ firewall: ...@@ -11,6 +11,7 @@ firewall:
- python-virtualenvwrapper - python-virtualenvwrapper
- python-devel - python-devel
- libmemcached-devel - libmemcached-devel
- python2-pip
- dhcp - dhcp
{% else %} {% else %}
- zlib1g-dev - zlib1g-dev
...@@ -18,6 +19,7 @@ firewall: ...@@ -18,6 +19,7 @@ firewall:
- python-dev - python-dev
- libmemcached-dev - libmemcached-dev
- openvswitch-switch - openvswitch-switch
- python-pip
{% if grains['os'] != 'Debian' %} {% if grains['os'] != 'Debian' %}
{# No such package in Debian Jessie! #} {# No such package in Debian Jessie! #}
- openvswitch-controller - openvswitch-controller
...@@ -25,7 +27,6 @@ firewall: ...@@ -25,7 +27,6 @@ firewall:
- isc-dhcp-server - isc-dhcp-server
{% endif %} {% endif %}
- git - git
- python-pip
- ntp - ntp
- iptables - iptables
- ipset - ipset
......
salt/graphite/init.sls
...@@ -7,13 +7,14 @@ graphite: ...@@ -7,13 +7,14 @@ graphite:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- ntp - ntp
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- pycairo - pycairo
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
{% else %} {% else %}
- python-pip
- python-cairo - python-cairo
- python-dev - python-dev
- virtualenvwrapper - virtualenvwrapper
......
salt/manager/init.sls
...@@ -13,7 +13,6 @@ manager: ...@@ -13,7 +13,6 @@ manager:
- pkgs: - pkgs:
- postgresql - postgresql
- git - git
- python-pip
- ntp - ntp
- rabbitmq-server - rabbitmq-server
- memcached - memcached
...@@ -21,6 +20,7 @@ manager: ...@@ -21,6 +20,7 @@ manager:
- wget - wget
- swig - swig
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libffi-devel - libffi-devel
- openssl-devel - openssl-devel
- libmemcached-devel - libmemcached-devel
...@@ -32,6 +32,7 @@ manager: ...@@ -32,6 +32,7 @@ manager:
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
{% else %} {% else %}
- python-pip
- libffi-dev - libffi-dev
- libssl-dev - libssl-dev
- libmemcached-dev - libmemcached-dev
......
salt/monitor-client/init.sls
...@@ -7,13 +7,14 @@ monitor-client: ...@@ -7,13 +7,14 @@ monitor-client:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- ntp - ntp
- wget - wget
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
{% else %} {% else %}
- python-pip
- python-dev - python-dev
- virtualenvwrapper - virtualenvwrapper
{% endif %} {% endif %}
......
salt/storagedriver/init.sls
...@@ -8,15 +8,16 @@ storagedriver: ...@@ -8,15 +8,16 @@ storagedriver:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- ntp - ntp
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libmemcached-devel - libmemcached-devel
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
- qemu-img - qemu-img
- zlib-devel - zlib-devel
{% else %} {% else %}
- python-pip
- libmemcached-dev - libmemcached-dev
- python-dev - python-dev
- qemu-utils - qemu-utils
......
salt/vmdriver/init.sls
...@@ -8,12 +8,12 @@ vmdriver: ...@@ -8,12 +8,12 @@ vmdriver:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- python-augeas - python-augeas
- ntp - ntp
- wget - wget
- qemu-kvm - qemu-kvm
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libmemcached-devel - libmemcached-devel
- libvirt - libvirt
- libvirt-daemon - libvirt-daemon
...@@ -26,6 +26,7 @@ vmdriver: ...@@ -26,6 +26,7 @@ vmdriver:
- qemu-img - qemu-img
- zlib-devel - zlib-devel
{% else %} {% else %}
- python-pip
- libmemcached-dev - libmemcached-dev
- libvirt-bin - libvirt-bin
- libxml2-dev - libxml2-dev
......
salt/vncproxy/init.sls
...@@ -7,15 +7,16 @@ vncproxy: ...@@ -7,15 +7,16 @@ vncproxy:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- git - git
- python-pip
- ntp - ntp
- wget - wget
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
- python2-pip
- libffi-devel - libffi-devel
- openssl-devel - openssl-devel
- python-devel - python-devel
- python-virtualenvwrapper - python-virtualenvwrapper
{% else %} {% else %}
- python-pip
- libffi-dev - libffi-dev
- libssl-dev - libssl-dev
- python-dev - python-dev
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment