From 9a30d3a309ecf51fe93b20245a7b05c04c117beb Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 5 Sep 2013 16:12:47 -0700
Subject: [PATCH] Upgrade puppetlabs-mysql to 0.6.1.

Puppetlabs-mysql 0.6.1 correctly removes the local ::1 root user in the
account_security manifest. Upgrade to this version to take advantage of
that. Do not upgrade to latest version (0.9.0) to minimize delta that
needs testing.

Change-Id: Ic8265733f1159f34ae0afcccdea4c7d8cd44e3cb
---
 install_modules.sh                          | 2 +-
 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 ----
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/install_modules.sh b/install_modules.sh
index 5529be392c..4d69db86e7 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -28,7 +28,7 @@ MODULES["openstackci-vcsrepo"]="0.0.8"
 MODULES["puppetlabs-apache"]="0.0.4"
 MODULES["puppetlabs-apt"]="1.1.0"
 MODULES["puppetlabs-haproxy"]="0.3.0"
-MODULES["puppetlabs-mysql"]="0.5.0"
+MODULES["puppetlabs-mysql"]="0.6.1"
 MODULES["puppetlabs-postgresql"]="2.3.0"
 MODULES["puppetlabs-stdlib"]="3.2.0"
 MODULES["saz-memcached"]="2.0.2"
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 48180d6c62..1d2ed192a1 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -251,10 +251,6 @@ 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 1dbb1881f5..f50466e4c4 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -210,10 +210,6 @@ 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 86a069570e..a67fb8c85d 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -35,11 +35,6 @@ 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 2d1c7db56b..10a95870b8 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -46,10 +46,6 @@ 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'],