Thcipriani has uploaded a new change for review.

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

Change subject: Add version to mariadb package resource
......................................................................

Add version to mariadb package resource

Both Trusty and Precise complain and require '--force-yes' to install
mariadb packages via this puppet module.

Older versions of puppet (like the one from the Trusty repo) don't support
install_options for the apt provider—must specify a package version to
trigger --force-yes to be appended to install command.

Change-Id: Id34902254eeb456fea070d58ea0aa37098295e86
---
M manifests/packages.pp
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/mariadb 
refs/changes/28/195328/1

diff --git a/manifests/packages.pp b/manifests/packages.pp
index 11b79e7..85e0992 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -7,6 +7,7 @@
         uri        => 'http://apt.wikimedia.org/wikimedia',
         dist       => 'precise-wikimedia',
         components => 'mariadb',
+        notify     => Exec['apt-get update'],
     }
 
     package { [
@@ -14,9 +15,18 @@
         'mariadb-client-5.5',
         'mariadb-server-5.5',
         'mariadb-server-core-5.5',
+    ]:
+        # Needed to trigger --force-yes on versions of puppet without
+        # the install_options parameter (read: Trusty)
+        ensure  => '5.5.34+maria-1~precise',
+        require => Apt::Repository['wikimedia_mariadb'],
+    }
+
+    package { [
         'percona-toolkit',
         'percona-xtrabackup',
     ]:
-        ensure => present,
+        ensure  => present,
+        require => Apt::Repository['wikimedia_mariadb'],
     }
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id34902254eeb456fea070d58ea0aa37098295e86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Thcipriani <[email protected]>

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

Reply via email to