opendev
/
puppet-graphite
Code Issues Proposed changes

Merge "Install graphite-web and carbon with pip."

This commit is contained in:
Jenkins 2013-12-03 23:37:39 +00:00 committed by Gerrit Code Review
parent fe47303a03 730554d518
commit 644bebd935
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -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'],