Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86281
Change subject: Move generic::pythonpip into the stats role.
......................................................................
Move generic::pythonpip into the stats role.
That's the only place it's used.
Change-Id: Ib0123c0aea9230b4159d48f8f643c0ad0d09d6e5
---
M manifests/generic-definitions.pp
M manifests/role/statistics.pp
2 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/86281/1
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index f7a68e9..85e2e4a 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -305,27 +305,6 @@
}
}
-# python pip and virtualenv.
-# only use this on development systems.
-# in order to go to production, all dependencies need to come from debian
packages, not pip.
-class generic::pythonpip {
- package { [ "python-pip", "python-dev", "build-essential" ]:
- ensure => latest;
- }
-
- # pip could be in /usr/bin/ or in /usr/local/bin
- exec { "update_pip":
- command => "pip install --upgrade pip",
- path => ["/usr/bin", "/usr/local/bin"],
- require => Package["python-pip"];
- "update_virtualenv":
- command => "pip install --upgrade virtualenv",
- path => ["/usr/bin", "/usr/local/bin"],
- require => Package["python-pip"];
- }
-}
-
-
class generic::wikidev-umask {
# set umask to 0002 for wikidev users, per RT-804
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 9504f51..3670698 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -20,7 +20,7 @@
misc::statistics::db::mysql,
# Aaron Halfaker (halfak) wants MongoDB for his project.
misc::statistics::db::mongo,
- generic::pythonpip,
+ role::statistics::pythonpip,
misc::udp2log::udp_filter,
# generate gerrit stats from stat1.
misc::statistics::gerrit_stats,
@@ -58,7 +58,7 @@
misc::statistics::dataset_mount,
misc::statistics::mediawiki,
misc::statistics::plotting,
- generic::pythonpip,
+ role::statistics::pythonpip,
misc::udp2log::udp_filter,
# rsync logs from logging hosts
# wikistats code is run here to
@@ -68,3 +68,24 @@
misc::statistics::rsync::jobs::webrequest,
misc::statistics::rsync::jobs::eventlogging
}
+
+
+# python pip and virtualenv.
+# only use this on development systems.
+# in order to go to production, all dependencies need to come from debian
packages, not pip.
+class role:statistics:pythonpip {
+ package { [ "python-pip", "python-dev", "build-essential" ]:
+ ensure => latest;
+ }
+
+ # pip could be in /usr/bin/ or in /usr/local/bin
+ exec { "update_pip":
+ command => "pip install --upgrade pip",
+ path => ["/usr/bin", "/usr/local/bin"],
+ require => Package["python-pip"];
+ "update_virtualenv":
+ command => "pip install --upgrade virtualenv",
+ path => ["/usr/bin", "/usr/local/bin"],
+ require => Package["python-pip"];
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/86281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0123c0aea9230b4159d48f8f643c0ad0d09d6e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
