Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/363382 )

Change subject: use 'require_package' for stats packages including python-yaml
......................................................................


use 'require_package' for stats packages including python-yaml

python-yaml is required by prometheus node_puppet_agent, and
ensure_packages doesn't apparently play nice with require_package.

Change-Id: I93d971fc91ddd481abe9fcf8a00183c3e66bae5d
---
M modules/statistics/manifests/packages.pp
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/statistics/manifests/packages.pp 
b/modules/statistics/manifests/packages.pp
index 38683ea..39248ca 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -6,7 +6,7 @@
     include ::geoip
     include ::imagemagick::install
 
-    ensure_packages([
+    require_package([
         'emacs',
         'mc',
         'zip',
@@ -45,7 +45,7 @@
     ])
 
     # Python packages
-    ensure_packages ([
+    require_package ([
         'python-geoip',
         'libapache2-mod-python',
         'python-mysqldb',
@@ -70,13 +70,13 @@
 
     # This is a custom package and currently not available on jessie, don't 
install on jessie for now
     if os_version('ubuntu >= trusty') {
-        ensure_packages([
+        require_package([
             'python-pygeoip', # For geo-encoding IP addresses
         ])
     }
 
     # FORTRAN packages (T89414)
-    ensure_packages([
+    require_package([
         'gfortran',        # GNU Fortran 95 compiler
         'gfortran-4.8',    # Requested by bearloga (Mikhail); see T147682 and 
http://stackoverflow.com/a/36034866/1091835 for more info
         'liblapack-dev',   # FORTRAN library of linear algebra routines
@@ -84,7 +84,7 @@
     ])
 
     # Plotting packages
-    ensure_packages([
+    require_package([
         'ploticus',
         'libploticus0',
         'libcairo2',
@@ -119,7 +119,7 @@
         # spell checker/dictionary packages for research (halfak)
         # T99030 - for machine learning and natural language processing
         # T121011 - for vandalism detection
-        ensure_packages([
+        require_package([
             'enchant', # generic spell checking library (uses myspell as 
backend)
             'aspell-id',   # Indonesian dictionary for GNU aspell
             'hunspell-vi', # Vietnamese dictionary for hunspell

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93d971fc91ddd481abe9fcf8a00183c3e66bae5d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to