From 0adc30f151a6ddd94f121bb48e02f42a8486aa20 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 5 Sep 2013 16:10:29 -0700
Subject: [PATCH] Remove ::1 mysql root user.

The version of puppetlabs-mysql that we use does not remove the local
::1 root user from the mysqld. Explicitly remove this user.

Change-Id: I626fcc77c75a29d3f3cab57217b714e68a30b468
---
 modules/gerrit/manifests/init.pp            | 4 ++++
 modules/jenkins/manifests/slave.pp          | 4 ++++
 modules/nodepool/manifests/init.pp          | 5 +++++
 modules/openstack_project/manifests/wiki.pp | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 1d2ed192a1..48180d6c62 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -251,6 +251,10 @@ class gerrit(
     }
   }
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
 
   mysql::db { 'reviewdb':
     user     => 'gerrit2',
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index f50466e4c4..1dbb1881f5 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -210,6 +210,10 @@ class jenkins::slave(
       }
     }
     include mysql::server::account_security
+    mysql::database_user { 'root@::1':
+      ensure  => absent,
+      require => Class['mysql::config'],
+    }
 
     mysql::db { 'openstack_citest':
       user     => 'openstack_citest',
diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index a67fb8c85d..86a069570e 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -35,6 +35,11 @@ class nodepool (
   }
 
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
+
   include mysql::python
 
   mysql::db { 'nodepool':
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 10a95870b8..2d1c7db56b 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -46,6 +46,10 @@ class openstack_project::wiki (
     }
   }
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
 
   mysql_backup::backup { 'wiki':
     require => Class['mysql::server'],