Merge "Upgrade puppetlabs-mysql to 0.6.1."

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"

modules/gerrit/manifests/init.pp

@@ -271,10 +271,6 @@ class gerrit(
     }
   }
   include mysql::server::account_security
-  mysql::database_user { 'root@::1':
-    ensure  => absent,
-    require => Class['mysql::config'],
-  }
 
   mysql::db { 'reviewdb':
     user     => 'gerrit2',

modules/jenkins/manifests/slave.pp

@@ -209,10 +209,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',

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':

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'],