Jcrespo has uploaded a new change for review.

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

Change subject: Use mariadb::service; prevent puppet from managing mysql 
symlinks
......................................................................

Use mariadb::service; prevent puppet from managing mysql symlinks

New package manages mysql/mariadb/mysqldump/etc. aliases with
update-alternatives. Stop doing it on puppet.

init.d is now overwritten by mariadb::service. Stop doing it on
the role.

Change-Id: I31834270d895930e2fe09abfcc9525e786be0ab2
---
M modules/role/manifests/analytics_cluster/database/meta.pp
1 file changed, 2 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/316595/1

diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp 
b/modules/role/manifests/analytics_cluster/database/meta.pp
index 6d1a5e9..7d40403 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -6,9 +6,8 @@
     # Some CDH database init scripts need Java to run.
     require role::analytics_cluster::java
 
-    class { 'mariadb::packages_wmf':
-        mariadb10 => true,
-    }
+    include mariadb::packages_wmf
+    include mariadb::service
 
     $config_template = $::realm ? {
         # Production instance has large innodb_buffer_pool_size.
@@ -23,21 +22,6 @@
         datadir   => '/var/lib/mysql',
         read_only => false,
         require   => Class['mariadb::packages_wmf'],
-    }
-
-    file { '/etc/init.d/mysql':
-        ensure  => link,
-        target  => '/opt/wmf-mariadb10/service',
-        require => Class['mariadb::packages_wmf'],
-    }
-
-    # Make /usr/local/bin/mysql and /usr/bin/mysql a pointer to
-    # mariadb10 mysql client.  /usr/bin/mysql allows
-    # cdh::hive::metastore::mysql execs to run.
-    file { ['/usr/local/bin/mysql', '/usr/bin/mysql']:
-        ensure  => link,
-        target  => '/opt/wmf-mariadb10/bin/mysql',
-        require => Class['mariadb::packages_wmf'],
     }
 
     # if labs, automate mysql_install_db.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31834270d895930e2fe09abfcc9525e786be0ab2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>

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

Reply via email to