openstack
/
fuel-library
Code Issues Proposed changes

fixed cluster::mysql requires mysql client installed 

cluster::mysql calls `mysql` command in create-init-file
However mysql client package is not installed at a moment,
when this command is executed. Thus it fails.

Change-Id: Iaf4dd8f8ffe58e47bef07df04952d889a8c32212
Closes-Bug: #1638904
Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
This commit is contained in:
Pavel Glushchak 2016-11-03 15:42:55 +03:00
parent 30cdded01e
commit 9e3f6cf0ad
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,12 +310,17 @@ class osnailyfacter::database::database {
$mysql_config = '/etc/mysql/my.cnf'
}
class { '::openstack::galera::client':
custom_setup_class => $custom_setup_class,
}
# include our integration with pacemaker
class { '::cluster::mysql':
mysql_user => $status_user,
mysql_password => $status_password,
mysql_config => $mysql_config,
mysql_socket => $mysql_socket,
require => Class['::openstack::galera::client'],
}
# this overrides /root/.my.cnf created by mysql::server::root_password

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

@ -199,6 +199,10 @@ describe manifest do
)
end
it 'should install mysql client package' do
should contain_class('openstack::galera::client')
end
it 'should configure pacemaker with mysql service' do
should contain_class('cluster::mysql').with(
:mysql_user => 'clustercheck',