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
This commit is contained in:
Clark Boylan 2013-09-05 16:12:47 -07:00 committed by Jeremy Stanley
parent 0adc30f151
commit 9a30d3a309
5 changed files with 1 additions and 18 deletions

View File

@ -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"

View File

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

View File

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

View File

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

View File

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