Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/279131
Change subject: mysql: make lint ignore classes inhering from params
......................................................................
mysql: make lint ignore classes inhering from params
Instead of globally turning this off in puppet-lint.rc,
mark the few actual occurences as FIXMEs and let lint ignore
them in those specific places only.
Change-Id: I5deef55101c5105007521ff366182af955baf29b
---
M modules/mysql/manifests/config.pp
M modules/mysql/manifests/init.pp
M modules/mysql/manifests/java.pp
M modules/mysql/manifests/php.pp
M modules/mysql/manifests/python.pp
M modules/mysql/manifests/ruby.pp
M modules/mysql/manifests/server.pp
7 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/279131/1
diff --git a/modules/mysql/manifests/config.pp
b/modules/mysql/manifests/config.pp
index e12d02a..83623af 100644
--- a/modules/mysql/manifests/config.pp
+++ b/modules/mysql/manifests/config.pp
@@ -56,7 +56,10 @@
$restart = $mysql::params::restart,
$purge_conf_dir = false,
$multi_instance = false
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
File {
owner => 'root',
diff --git a/modules/mysql/manifests/init.pp b/modules/mysql/manifests/init.pp
index f415436..a7a47ff 100644
--- a/modules/mysql/manifests/init.pp
+++ b/modules/mysql/manifests/init.pp
@@ -14,7 +14,10 @@
class mysql (
$package_name = $mysql::params::client_package_name,
$package_ensure = 'present'
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
package { 'mysql_client':
ensure => $package_ensure,
diff --git a/modules/mysql/manifests/java.pp b/modules/mysql/manifests/java.pp
index 2713c05..80a6070 100644
--- a/modules/mysql/manifests/java.pp
+++ b/modules/mysql/manifests/java.pp
@@ -14,7 +14,10 @@
class mysql::java (
$package_name = $mysql::params::java_package_name,
$package_ensure = 'present'
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
package { 'mysql-connector-java':
ensure => $package_ensure,
diff --git a/modules/mysql/manifests/php.pp b/modules/mysql/manifests/php.pp
index 88e5aa2..092af93 100644
--- a/modules/mysql/manifests/php.pp
+++ b/modules/mysql/manifests/php.pp
@@ -10,7 +10,10 @@
class mysql::php(
$package_name = $mysql::params::php_package_name,
$package_ensure = 'present'
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
package { 'php-mysql':
ensure => $package_ensure,
diff --git a/modules/mysql/manifests/python.pp
b/modules/mysql/manifests/python.pp
index 0a22da8..a436d3b 100644
--- a/modules/mysql/manifests/python.pp
+++ b/modules/mysql/manifests/python.pp
@@ -16,7 +16,10 @@
class mysql::python(
$package_name = $mysql::params::python_package_name,
$package_ensure = 'present'
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
package { 'python-mysqldb':
ensure => $package_ensure,
diff --git a/modules/mysql/manifests/ruby.pp b/modules/mysql/manifests/ruby.pp
index 6f8f46b..54bedb2 100644
--- a/modules/mysql/manifests/ruby.pp
+++ b/modules/mysql/manifests/ruby.pp
@@ -17,7 +17,10 @@
$package_name = $mysql::params::ruby_package_name,
$package_provider = $mysql::params::ruby_package_provider,
$package_ensure = 'present'
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
package{ 'ruby_mysql':
ensure => $package_ensure,
diff --git a/modules/mysql/manifests/server.pp
b/modules/mysql/manifests/server.pp
index 919b757..829f170 100644
--- a/modules/mysql/manifests/server.pp
+++ b/modules/mysql/manifests/server.pp
@@ -23,7 +23,10 @@
$enabled = true,
$manage_service = false,
$use_apparmor = true,
+# FIXME - class inheriting from params class
+# lint:ignore:class_inherits_from_params_class
) inherits mysql::params {
+# lint:endignore
Class['mysql::server::package'] -> Class['mysql::config']
--
To view, visit https://gerrit.wikimedia.org/r/279131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5deef55101c5105007521ff366182af955baf29b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
