From 730554d51837aa308774c25edc94c0cbd4cc0877 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 26 Nov 2013 16:20:51 -0800 Subject: [PATCH] Install graphite-web and carbon with pip. These were not initially switched to pip installs because they are different. Put the necessary different pip stuff in place to deal with graphite-web and carbon so that their installs are consistent with everything else. Change-Id: Ieef60a228e284c936307291c4ed44930791cc631 --- manifests/init.pp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 741eb78..9dad3fb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,9 +26,8 @@ class graphite( } exec { 'install_graphite_web' : - command => 'python setup.py install --install-scripts=/usr/local/bin --install-lib=/usr/local/lib/python2.7/dist-packages --install-data=/var/lib/graphite', - cwd => '/opt/graphite-web', - path => '/bin:/usr/bin', + command => 'pip install --install-option="--install-scripts=/usr/local/bin" --install-option="--install-lib=/usr/local/lib/python2.7/dist-packages" --install-option="--install-data=/var/lib/graphite" /opt/graphite-web', + path => '/usr/local/bin:/usr/bin:/bin', refreshonly => true, subscribe => Vcsrepo['/opt/graphite-web'], require => [Exec['install_carbon'], @@ -43,9 +42,8 @@ class graphite( } exec { 'install_carbon' : - command => 'python setup.py install --install-scripts=/usr/local/bin --install-lib=/usr/local/lib/python2.7/dist-packages --install-data=/var/lib/graphite', - cwd => '/opt/carbon', - path => '/bin:/usr/bin', + command => 'pip install --install-option="--install-scripts=/usr/local/bin" --install-option="--install-lib=/usr/local/lib/python2.7/dist-packages" --install-option="--install-data=/var/lib/graphite" /opt/carbon', + path => '/usr/local/bin:/usr/bin:/bin', refreshonly => true, subscribe => Vcsrepo['/opt/carbon'], require => [Exec['install_whisper'],