opendev
/
puppet-lodgeit
Code Issues Proposed changes

Merge "fix puppet-lodgeit to support latest mysql"

This commit is contained in:
Jenkins 2016-03-10 15:05:17 +00:00 committed by Gerrit Code Review
parent 6ef73c05ef 49932b823c
commit ad9af0541d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/mysql.pp
View File

@ -7,10 +7,11 @@ class lodgeit::mysql(
$database_password, $database_password,
) { ) {
class { '::mysql::server': class { '::mysql::server':
config_hash => { root_password => $mysql_root_password,
'root_password' => $mysql_root_password, override_options => {
'default_engine' => 'InnoDB', 'mysqld' => {
'bind_address' => '127.0.0.1', 'default-storage-engine' => 'InnoDB',
}
} }
} }
include ::mysql::server::account_security include ::mysql::server::account_security

7
spec/acceptance/fixtures/preconditions.pp
View File

@ -1,5 +1,10 @@
class { '::mysql::server': class { '::mysql::server':
config_hash => { 'root_password' => '123456' }, root_password => $mysql_root_password,
override_options => {
'mysqld' => {
'default-storage-engine' => 'InnoDB',
}
}
} }
mysql::db { 'acceptance': mysql::db { 'acceptance':