[MediaWiki-commits] [Gerrit] graphite: remove $::lsbdistcodename branch - change (operations/puppet)

2014-12-15 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179884

Change subject: graphite: remove $::lsbdistcodename branch
..

graphite: remove $::lsbdistcodename branch

Depending on $::lsbdistcodename to find the path to manage.py isn't very
pretty, nor very future proof. Fortunately, the packages are shipping
/usr/bin/graphite-manage that does all this for us, so use that instead.

Change-Id: I08ad2334554aa1ea646f31bb78f5b3ffadc721b0
---
M modules/graphite/manifests/web.pp
1 file changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/179884/1

diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 9de4aba..4c61335 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -71,14 +71,8 @@
 require = Package['graphite-web'],
 }
 
-if $::lsbdistcodename == 'trusty' {
-$graphite_manage_path = 
'/usr/lib/python2.7/dist-packages/graphite/manage.py'
-} else {
-$graphite_manage_path = '/usr/share/pyshared/graphite/manage.py'
-}
-
 exec { 'graphite_syncdb':
-command = /usr/bin/python $graphite_manage_path syncdb 
--noinput,
+command = '/usr/bin/graphite-manage syncdb --noinput',
 user= 'www-data',
 subscribe   = File['/etc/graphite/local_settings.py'],
 refreshonly = true,

-- 
To view, visit https://gerrit.wikimedia.org/r/179884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08ad2334554aa1ea646f31bb78f5b3ffadc721b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] graphite: remove $::lsbdistcodename branch - change (operations/puppet)

2014-12-15 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: graphite: remove $::lsbdistcodename branch
..


graphite: remove $::lsbdistcodename branch

Depending on $::lsbdistcodename to find the path to manage.py isn't very
pretty, nor very future proof. Fortunately, the packages are shipping
/usr/bin/graphite-manage that does all this for us, so use that instead.

Change-Id: I08ad2334554aa1ea646f31bb78f5b3ffadc721b0
---
M modules/graphite/manifests/web.pp
1 file changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 9de4aba..4c61335 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -71,14 +71,8 @@
 require = Package['graphite-web'],
 }
 
-if $::lsbdistcodename == 'trusty' {
-$graphite_manage_path = 
'/usr/lib/python2.7/dist-packages/graphite/manage.py'
-} else {
-$graphite_manage_path = '/usr/share/pyshared/graphite/manage.py'
-}
-
 exec { 'graphite_syncdb':
-command = /usr/bin/python $graphite_manage_path syncdb 
--noinput,
+command = '/usr/bin/graphite-manage syncdb --noinput',
 user= 'www-data',
 subscribe   = File['/etc/graphite/local_settings.py'],
 refreshonly = true,

-- 
To view, visit https://gerrit.wikimedia.org/r/179884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I08ad2334554aa1ea646f31bb78f5b3ffadc721b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits