Andrew Bogott has submitted this change and it was merged.
Change subject: Remove generic::mysql::packages in favor of mysql module
......................................................................
Remove generic::mysql::packages in favor of mysql module
Change-Id: Ic7ba3ff1fb48df962af7f369bd93d26caaf68501
---
M manifests/misc/racktables.pp
M manifests/mysql.pp
M manifests/openstack.pp
M manifests/role/db.pp
M manifests/site.pp
5 files changed, 18 insertions(+), 67 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/racktables.pp b/manifests/misc/racktables.pp
index b51d421..bc8fbc1 100644
--- a/manifests/misc/racktables.pp
+++ b/manifests/misc/racktables.pp
@@ -2,7 +2,7 @@
class misc::racktables {
- include generic::mysql::packages::client,
+ include mysql,
passwords::racktables
# variables
@@ -18,4 +18,4 @@
content => template('racktables/racktables.config.erb');
}
-}
\ No newline at end of file
+}
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index f1d5538..18c0853 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -1,52 +1,4 @@
-# The mysql classes below can be used for installing
-# generic mysql servers and clients. These
-# are not (yet?) meant for serious production installs.
-
-# Installs the mysql-client package
-class generic::mysql::packages::client($version = "") {
- # This conflicts with class mysql::packages. DO NOT use them together
- if !$version {
- if versioncmp($::lsbdistrelease, "12.04") >= 0 {
- $ver = "5.5"
- }
- else {
- $ver = "5.1"
- }
- }
- else {
- $ver = $version
- }
-
- package { "mysql-client-${ver}":
- ensure => latest,
- alias => "mysql-client",
- }
- package { "libmysqlclient-dev":
- ensure => latest,
- }
-}
-
-class generic::mysql::packages::server($version = "") {
- # This conflicts with class mysql::packages. DO NOT use them together
- # if installed on a host with an external IP address, be sure to run a
firewall.
- if !$version {
- if versioncmp($::lsbdistrelease, "12.04") >= 0 {
- $ver = "5.5"
- }
- else {
- $ver = "5.1"
- }
- }
- else {
- $ver = $version
- }
-
- package { "mysql-server-${ver}":
- ensure => present,
- alias => "mysql-server"
- }
-}
-
+# The following class is obsolete, please use the mysql module instead.
# installs mysql-server, configures app armor
# and my.cnf, starts mysqld.
@@ -132,8 +84,7 @@
{
# make sure mysql-server and mysql-client are
# installed with the specified version.
- class { "generic::mysql::packages::server": version => $version }
- class { "generic::mysql::packages::client": version => $version }
+ include mysql::server::package, mysql
include generic::apparmor::service
# /var/run has moved to /run in newer Ubuntu versions.
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 0a54eb2..64a9e91 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -154,7 +154,7 @@
require => Class["openstack::repo"];
}
- require generic::mysql::packages::client,
generic::mysql::packages::server
+ require mysql, mysql::server::package
# For IPv6 support
package { [ "python-netaddr", "radvd" ]:
@@ -333,7 +333,7 @@
if !defined(Service['mysql']) {
service { "mysql":
enable => true,
- require => Class['generic::mysql::packages::server'],
+ require => Class['mysql::server::package'],
ensure => running;
}
}
@@ -343,34 +343,34 @@
'set_root':
onlyif => "/usr/bin/mysql -uroot --password=''",
command => "/usr/bin/mysql -uroot --password='' mysql <
/etc/nova/mysql.sql",
- require => [Class["generic::mysql::packages::client"],
File["/etc/nova/mysql.sql"]],
+ require => [Class['mysql'],
File["/etc/nova/mysql.sql"]],
before => Exec['create_nova_db'];
'create_nova_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/nova/nova-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/nova/nova-user.sql",
- require => [Class["generic::mysql::packages::client"],
File["/etc/nova/nova-user.sql", "/etc/nova/nova-user.cnf", "/root/.my.cnf"]];
+ require => [Class['mysql'],
File["/etc/nova/nova-user.sql", "/etc/nova/nova-user.cnf", "/root/.my.cnf"]];
'create_nova_db':
unless => "/usr/bin/mysql -uroot $nova_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$nova_db_name;\"",
- require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
+ require => [Class['mysql'], File["/root/.my.cnf"]],
before => Exec['create_nova_db_user'];
'create_puppet_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/puppet/puppet-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/puppet/puppet-user.sql",
- require => [Class["generic::mysql::packages::client"],
File["/etc/puppet/puppet-user.sql", "/etc/puppet/puppet-user.cnf",
"/root/.my.cnf"]];
+ require => [Class['mysql'],
File["/etc/puppet/puppet-user.sql", "/etc/puppet/puppet-user.cnf",
"/root/.my.cnf"]];
'create_puppet_db':
unless => "/usr/bin/mysql -uroot $puppet_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$puppet_db_name;\"",
- require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
+ require => [Class['mysql'], File["/root/.my.cnf"]],
before => Exec['create_puppet_db_user'];
'create_glance_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/glance/glance-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/glance/glance-user.sql",
- require => [Class['generic::mysql::packages::client'],
File["/etc/glance/glance-user.sql","/etc/glance/glance-user.cnf","/root/.my.cnf"]];
+ require => [Class['mysql'],
File["/etc/glance/glance-user.sql","/etc/glance/glance-user.cnf","/root/.my.cnf"]];
'create_glance_db':
unless => "/usr/bin/mysql -uroot $glance_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$glance_db_name;\"",
- require => [Class['generic::mysql::packages::client'],
File["/root/.my.cnf"]],
+ require => [Class['mysql'], File["/root/.my.cnf"]],
before => Exec['create_glance_db_user'];
}
@@ -378,11 +378,11 @@
'create_keystone_db_user':
unless => "/usr/bin/mysql
--defaults-file=/etc/keystone/keystone-user.cnf -e 'exit'",
command => "/usr/bin/mysql -uroot <
/etc/keystone/keystone-user.sql",
- require => [Class["generic::mysql::packages::client"],
File["/etc/keystone/keystone-user.sql", "/etc/keystone/keystone-user.cnf",
"/root/.my.cnf"]];
+ require => [Class['mysql'],
File["/etc/keystone/keystone-user.sql", "/etc/keystone/keystone-user.cnf",
"/root/.my.cnf"]];
'create_keystone_db':
unless => "/usr/bin/mysql -uroot $keystone_db_name -e
'exit'",
command => "/usr/bin/mysql -uroot -e \"create database
$keystone_db_name;\"",
- require => [Class["generic::mysql::packages::client"],
File["/root/.my.cnf"]],
+ require => [Class['mysql'], File["/root/.my.cnf"]],
before => Exec['create_keystone_db_user'];
}
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 112972a..e86781b 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -114,7 +114,7 @@
}
class role::db::maintenance {
- include generic::mysql::packages::client
+ include mysql
package { "percona-toolkit":
ensure => latest;
diff --git a/manifests/site.pp b/manifests/site.pp
index 4be9cab..671f534 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1208,7 +1208,7 @@
$cluster = "misc"
include role::applicationserver::maintenance,
- generic::mysql::packages::client,
+ mysql,
nfs::netapp::home,
nfs::upload,
misc::deployment::scap_scripts,
@@ -2761,7 +2761,7 @@
misc::deployment,
misc::deployment::scap_scripts,
misc::deployment::l10nupdate,
- generic::mysql::packages::client,
+ mysql,
role::labsdb::manager,
ssh::hostkeys-collect
}
--
To view, visit https://gerrit.wikimedia.org/r/90194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7ba3ff1fb48df962af7f369bd93d26caaf68501
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
