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
(cherry picked from commit 6baddedafe)
This commit is contained in:
Swann Croiset 2017-02-13 16:05:44 +01:00
parent 9b898b7518
commit f17eb8dea2
1 changed files with 9 additions and 8 deletions

View File

@ -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: