From 6baddedafefee43380d7d391b8d5ffd304760c2a Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Mon, 13 Feb 2017 16:05:44 +0100 Subject: [PATCH] Support fuel-mirror The patch forces mysql-client-5.6 package to be installed instead of the upstream one. Change-Id: I6f3091da03e4712b51ec60f7946f8481f6394ce1 Related-bug: #1663498 --- .../puppet/manifests/grafana_mysql.pp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/deployment_scripts/puppet/manifests/grafana_mysql.pp b/deployment_scripts/puppet/manifests/grafana_mysql.pp index b861b1f6..821d9480 100644 --- a/deployment_scripts/puppet/manifests/grafana_mysql.pp +++ b/deployment_scripts/puppet/manifests/grafana_mysql.pp @@ -40,14 +40,15 @@ host=<%= @db_vip %> notify => Exec['remove_db_options_file'], } - if $is_mysql_server { - # The detach_database plugin installs a mysql-client-X.Y that may not be - # compatible with the mysql-client meta-package that is installed by - # mysql Puppet module. To avoid this issue we use the client that is - # installed by the detach_database plugin. - class { '::mysql::client': - package_manage => false, - } + package { 'ubuntu-mysql-client': + ensure => absent, + name => 'mysql-client', + } + + # MOS uses its own mysql-client package + class { '::mysql::client': + package_name => 'mysql-client-5.6', + require => Package['ubuntu-mysql-client'], } mysql::db { $db_name: