Andrew Bogott has submitted this change and it was merged.
Change subject: mysql: selector outside a resource + 4 spaces
......................................................................
mysql: selector outside a resource + 4 spaces
Change-Id: I448387252f4650dbb48f1a803bf6498132c18d24
---
M modules/mysql/manifests/server/package.pp
1 file changed, 16 insertions(+), 14 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Springle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/mysql/manifests/server/package.pp
b/modules/mysql/manifests/server/package.pp
index 32303cf..253d373 100644
--- a/modules/mysql/manifests/server/package.pp
+++ b/modules/mysql/manifests/server/package.pp
@@ -1,22 +1,24 @@
# This is handled by a separate class in case we want to just
# install the package and configure elsewhere.
class mysql::server::package (
- $package_name = $mysql::params::server_package_name,
+ $package_name = $mysql::params::server_package_name,
) {
- if $package_name =~ /mariadb/ {
- apt::repository { 'wikimedia-mariadb':
- uri => 'http://apt.wikimedia.org/wikimedia',
- dist => 'precise-wikimedia',
- components => 'mariadb',
+ if $package_name =~ /mariadb/ {
+ apt::repository { 'wikimedia-mariadb':
+ uri => 'http://apt.wikimedia.org/wikimedia',
+ dist => 'precise-wikimedia',
+ components => 'mariadb',
+ }
}
- }
- package { 'mysql-server':
- ensure => $package_ensure,
- name => $package_name,
- require => $package_name ? {
- 'mariadb-server-5.5' => Apt::Repository['wikimedia-mariadb'],
- default => undef
+ $package_source = $package_name ? {
+ 'mariadb-server-5.5' => Apt::Repository['wikimedia-mariadb'],
+ default => undef
}
- }
+
+ package { 'mysql-server':
+ ensure => $package_ensure,
+ name => $package_name,
+ require => $package_source,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/195518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I448387252f4650dbb48f1a803bf6498132c18d24
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
