graphite: move carbon package from pip to system's package manager

30345ad5 · Czémán Arnold · 3feb5a0c · 30345ad5 · 30345ad5
Commit 30345ad5 authored Jul 28, 2015 by Czémán Arnold
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletions

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

salt/graphite/virtualenv.sls
+8 -0

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