x/packstack
Code Issues Proposed changes

Merge "Don't try and delete the same user from mysql twice"

Browse Source
This commit is contained in:
Jenkins
2013-02-08 12:22:01 +00:00
committed by Gerrit Code Review
parent 4d14254047 2ed0d26b79
commit bc50ac29c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,12 +10,12 @@ class {"mysql::server":
database_user { [ 'root@127.0.0.1', 'root@::1', '@localhost', '@%%' ]:
ensure => 'absent', require => Class['mysql::config'],
}
if ($::fqdn != "") {
if ($::fqdn != "" and $::fqdn != "localhost") {
database_user { [ "root@${::fqdn}", "@${::fqdn}"]:
ensure => 'absent', require => Class['mysql::config'],
}
}
if ($::fqdn != $::hostname) {
if ($::fqdn != $::hostname and $::hostname != "localhost") {
database_user { ["root@${::hostname}", "@${::hostname}"]:
ensure => 'absent', require => Class['mysql::config'],
}