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

Change subject: mariadb: Deprecate precise repository usage
......................................................................


mariadb: Deprecate precise repository usage

No more references to precise- install official packages, if
available.

We should think of unifying packages and packages_wmf manifests
in a followup.

Change-Id: I1aec90d101b57d5ef460a15e79c9483390e2f9cf
---
M modules/mariadb/manifests/packages.pp
1 file changed, 3 insertions(+), 9 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/modules/mariadb/manifests/packages.pp 
b/modules/mariadb/manifests/packages.pp
index 11b79e7..aaeca71 100644
--- a/modules/mariadb/manifests/packages.pp
+++ b/modules/mariadb/manifests/packages.pp
@@ -1,13 +1,7 @@
-# MariaDB 5.5 debs -- slightly modified .debs from MariaDB.org.
-# Eventually these should probably just be upstream Debian packages by default.
+# MariaDB 5.5 debs
+# These are not used on production (packages_wmf.pp is used instead).
 
 class mariadb::packages {
-
-    apt::repository { 'wikimedia_mariadb':
-        uri        => 'http://apt.wikimedia.org/wikimedia',
-        dist       => 'precise-wikimedia',
-        components => 'mariadb',
-    }
 
     package { [
         'libmariadbclient18',
@@ -19,4 +13,4 @@
     ]:
         ensure => present,
     }
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1aec90d101b57d5ef460a15e79c9483390e2f9cf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@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