openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix apt discrepancy around mysql client package"

This commit is contained in:
Jenkins 2017-01-06 16:40:45 +00:00 committed by Gerrit Code Review
parent a4ad419368 7583f5cb17
commit 54b421f206
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/osnailyfacter/manifests/database/database.pp
View File

@ -295,6 +295,12 @@ class osnailyfacter::database::database {
override_options => $override_options,
}
# LP 1651182
# Ensure that client library replacement is installed before we try
# to install additional packages
Class["mysql::client"] -> Package[$::galera::params::additional_packages]
# Make sure the mysql service is stopped with upstart as we will be starting
# it with pacemaker
Exec <| title == 'clean_up_ubuntu' |> {

4
tests/noop/spec/hosts/database/database_spec.rb
View File

@ -174,6 +174,10 @@ describe manifest do
expect(graph).to ensure_transitive_dependency("Class[cluster::galera_status]", "Haproxy_backend_status[mysql]")
end
it 'should have explicit ordering between the client binary and additional packages' do
expect(graph).to ensure_transitive_dependency("Class[mysql::client]", "Package[percona-xtrabackup]")
end
it 'should setup the /root/.my.cnf' do
should contain_class('osnailyfacter::mysql_access').with(
:db_password => mysql_database_password