graphite: install carbon with pip instead of from repo on RedHat systems

bdfe29b7 · Dóbé Péter · ea128a1b · bdfe29b7 · bdfe29b7
Commit bdfe29b7 authored Jul 18, 2017 by Dóbé Péter
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 8 deletions

salt/graphite/files/requirements.txt
+1 -3

salt/graphite/virtualenv.sls
+0 -5

No files found.
--- a/salt/graphite/files/requirements.txt
+++ b/salt/graphite/files/requirements.txt
@@ -8,8 +8,6 @@ gunicorn
 pytz
 pyparsing
 whisper
-{% if grains['os_family'] != 'RedHat' %} 
-carbon==0.9.12
-{% endif %}
 scandir
+carbon==0.9.12
 graphite-web
--- a/salt/graphite/virtualenv.sls
+++ b/salt/graphite/virtualenv.sls
-{% if grains['os_family'] == 'RedHat' %}
-python-carbon:
-  pkg.installed
-{% endif %}
-
 virtualenv_graphite:
  virtualenv.managed:
    - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite