Skip to content
Snippets Groups Projects
Commit 7c2e437d authored by Riccardo Bucchi's avatar Riccardo Bucchi
Browse files

Merge branch 'percona' into 'dev'

updated percona pwd handling to percona > 1.0.0



See merge request !21
parents 55cbfe2d 4f82ab6d
No related branches found
No related tags found
Loading
......@@ -24,14 +24,14 @@ class iaas::profile::database (
privileges => ['ALL'],
require => File['/root/.my.cnf'],
}
file { '/root/.my.cnf':
ensure => 'present',
content => "[client]
user=root
host=localhost
password=$root_password\n",
mode => '600',
} ->
# file { '/root/.my.cnf':
# ensure => 'present',
# content => "[client]
#user=root
#host=localhost
#password=$root_password\n",
# mode => '600',
# } ->
package{'xinetd':
ensure => installed,
} ->
......@@ -45,12 +45,12 @@ password=$root_password\n",
master => $percona_master,
wsrep_node_address => $node_ip,
} ->
exec { 'drop anonymous users on specific host':
command => "mysql -u root -p$root_password -e \"GRANT USAGE ON *.* TO \'\'@\'$::hostname\'; DROP USER \'\'@\'$::hostname\';\"",
exec { 'drop anonymous users on specific host':
command => "mysql --defaults-extra-file=/root/.my.cnf -u root -e \"GRANT USAGE ON *.* TO \'\'@\'$::hostname\'; DROP USER \'\'@\'$::hostname\';\"",
path => [ '/bin', '/usr/bin' ],
} ->
exec { 'drop anonymous users on localhost':
command => "mysql -u root -p$root_password -e \"GRANT USAGE ON *.* TO \'\'@\'localhost\'; DROP USER \'\'@\'localhost\';\"",
command => "mysql --defaults-extra-file=/root/.my.cnf -u root -e \"GRANT USAGE ON *.* TO \'\'@\'localhost\'; DROP USER \'\'@\'localhost\';\"",
path => [ '/bin', '/usr/bin' ],
}
create_resources(mysql_database, $mysql_databases, $mysql_database_defaults)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment