Alexandros Kosiaris has submitted this change and it was merged.

Change subject: apertium: Remove trusty support
......................................................................


apertium: Remove trusty support

Remove the variation based on distribution and kill trusty support in
doing so

Change-Id: Ie0bff635b786129f678a93b2e0d3bcec7c82ff53
---
M modules/apertium/manifests/init.pp
1 file changed, 2 insertions(+), 18 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/apertium/manifests/init.pp 
b/modules/apertium/manifests/init.pp
index d8181a8..bf0fbe5 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -24,7 +24,7 @@
 
     $log_dir = "${::service::configuration::log_dir}/apertium"
 
-    $base_packages = [
+    $packages = [
         'apertium',
         'apertium-af-nl',
         'apertium-apy',
@@ -76,15 +76,7 @@
         'apertium-urd-hin',
         'cg3',
         'hfst',
-        'lttoolbox'
-    ]
-    $trusty_packages = [
-        'apertium-es-an',
-        'apertium-fr-ca',
-        'apertium-mkd',
-        'apertium-sv-da',
-    ]
-    $jessie_packages = [
+        'lttoolbox',
         'apertium-arg',
         'apertium-arg-cat',
         'apertium-cat',
@@ -102,14 +94,6 @@
         'giella-core',
         'giella-sme',
     ]
-
-    if os_version('ubuntu >= trusty') {
-        $packages = concat($base_packages, $trusty_packages)
-    } elsif os_version('debian >= jessie') {
-        $packages = concat($base_packages, $jessie_packages)
-    } else {
-        $packages = $base_packages  # Should never reach this but anyway
-    }
 
     package { $packages:
         ensure => present,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0bff635b786129f678a93b2e0d3bcec7c82ff53
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to