x/packstack
Code Issues Proposed changes

Merge "replacing mysql::server::account_security"

Browse Source
This commit is contained in:
Jenkins
2013-01-18 09:09:10 +00:00
committed by Gerrit Code Review
parent 2956d789ae 805602a24c
commit 8306c88dad
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packstack/puppet/templates/mysql.pp
View File

@@ -4,8 +4,21 @@ class {"mysql::server":
root_password => "%(CONFIG_MYSQL_PW)s",}
}
class {"mysql::server::account_security":
require => Class["mysql::server"],
# deleting database users for security
# this is done in mysql::server::account_security but has problems
# when there is no fqdn, so we're defining a slightly different one here
database_user { [ 'root@127.0.0.1', 'root@::1', '@localhost', '@%%' ]:
ensure => 'absent', require => Class['mysql::config'],
}
if ($::fqdn != "") {
database_user { [ "root@${::fqdn}", "@${::fqdn}"]:
ensure => 'absent', require => Class['mysql::config'],
}
}
if ($::fqdn != $::hostname) {
database_user { ["root@${::hostname}", "@${::hostname}"]:
ensure => 'absent', require => Class['mysql::config'],
}
}
class {"keystone::db::mysql":