opendev/system-config
Code Issues Proposed changes

Install graphite-web and carbon with pip.

Browse Source 
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
This commit is contained in:
Clark Boylan 2013-11-26 16:20:51 -08:00
parent 0222d3040e
commit 6af0a05de7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/graphite/manifests/init.pp
View File

@ -26,9 +26,8 @@ class graphite(
} }
exec { 'install_graphite_web' : 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', 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',
cwd => '/opt/graphite-web', path => '/usr/local/bin:/usr/bin:/bin',
path => '/bin:/usr/bin',
refreshonly => true, refreshonly => true,
subscribe => Vcsrepo['/opt/graphite-web'], subscribe => Vcsrepo['/opt/graphite-web'],
require => [Exec['install_carbon'], require => [Exec['install_carbon'],
@ -43,9 +42,8 @@ class graphite(
} }
exec { 'install_carbon' : 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', 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',
cwd => '/opt/carbon', path => '/usr/local/bin:/usr/bin:/bin',
path => '/bin:/usr/bin',
refreshonly => true, refreshonly => true,
subscribe => Vcsrepo['/opt/carbon'], subscribe => Vcsrepo['/opt/carbon'],
require => [Exec['install_whisper'], require => [Exec['install_whisper'],