Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350380 )
Change subject: role::mediawiki_maintenance: reorganize code
......................................................................
role::mediawiki_maintenance: reorganize code
- Move role::mariadb::maintenance to a profile
- Move inclusion of roles/profiles to the role
- Make the presence or absence of the tendril cronjob more explicit
Change-Id: I31532df5a5978394c9aca5c1f6f8e26ed8ea5e7b
---
M hieradata/role/codfw/mediawiki_maintenance.yaml
M hieradata/role/common/mediawiki_maintenance.yaml
R modules/profile/manifests/mariadb/maintenance.pp
M modules/profile/manifests/mediawiki/maintenance.pp
M modules/role/manifests/mediawiki_maintenance.pp
5 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/mediawiki_maintenance.yaml
b/hieradata/role/codfw/mediawiki_maintenance.yaml
index c4886db..7905493 100644
--- a/hieradata/role/codfw/mediawiki_maintenance.yaml
+++ b/hieradata/role/codfw/mediawiki_maintenance.yaml
@@ -1,4 +1,4 @@
-tendril::maintenance::ensure: absent
+profile::mariadb::maintenance::ensure: absent
debdeploy::grains:
debdeploy-mediawiki-maintenance-codfw:
value: standard
diff --git a/hieradata/role/common/mediawiki_maintenance.yaml
b/hieradata/role/common/mediawiki_maintenance.yaml
index c9f6c4d..7bc64e7 100644
--- a/hieradata/role/common/mediawiki_maintenance.yaml
+++ b/hieradata/role/common/mediawiki_maintenance.yaml
@@ -16,3 +16,4 @@
# Kill queries only after 1 day
read_timeout: 86400000
nutcracker::verbosity: "4"
+profile::mariadb::maintenance::ensure: present
diff --git a/modules/role/manifests/mariadb/maintenance.pp
b/modules/profile/manifests/mariadb/maintenance.pp
similarity index 64%
rename from modules/role/manifests/mariadb/maintenance.pp
rename to modules/profile/manifests/mariadb/maintenance.pp
index 8523af5..009deae 100644
--- a/modules/role/manifests/mariadb/maintenance.pp
+++ b/modules/profile/manifests/mariadb/maintenance.pp
@@ -1,7 +1,9 @@
-# maintenance needed on terbium (or similar) for tendril
-class role::mariadb::maintenance {
+# maintenance needed on maintenance hosts for tendril
+class profile::mariadb::maintenance(
+ $ensure = hiera('profile::mariadb::maintenance::ensure'),
+ ) {
# TODO: check if both of these are still needed
- include mysql
+ include ::mysql
package { 'percona-toolkit':
ensure => latest,
}
@@ -10,6 +12,7 @@
include passwords::tendril
class { 'tendril::maintenance':
+ ensure => $ensure,
tendril_host => 'db1011.eqiad.wmnet',
tendril_user => 'watchdog',
tendril_password => $passwords::tendril::db_pass,
diff --git a/modules/profile/manifests/mediawiki/maintenance.pp
b/modules/profile/manifests/mediawiki/maintenance.pp
index b3633fb..7ddb210 100644
--- a/modules/profile/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -1,24 +1,10 @@
# mediawiki maintenance server
class profile::mediawiki::maintenance {
- # Mediawiki
- include ::role::mediawiki::common
include ::mediawiki::packages::php5
-
- # NOC - https://noc.wikimedia.org/
- include ::role::noc::site
# Deployment
include ::scap::scripts
-
- # MariaDB (Tendril)
- include ::role::mariadb::maintenance
-
- # LDAP
- include ::role::openldap::management
- include ::ldap::role::client::labs
-
- include ::base::firewall
interface::add_ip6_mapped { 'main': interface => 'eth0', }
diff --git a/modules/role/manifests/mediawiki_maintenance.pp
b/modules/role/manifests/mediawiki_maintenance.pp
index 1e37eb4..aba34f8 100644
--- a/modules/role/manifests/mediawiki_maintenance.pp
+++ b/modules/role/manifests/mediawiki_maintenance.pp
@@ -1,5 +1,18 @@
class role::mediawiki_maintenance {
-
include ::standard
+ include ::base::firewall
+
+ # Mediawiki
+ include ::role::mediawiki::common
include ::profile::mediawiki::maintenance
+
+ # MariaDB (Tendril)
+ include ::profile::mariadb::maintenance
+
+ # NOC - https://noc.wikimedia.org/
+ include ::role::noc::site
+
+ # LDAP
+ include ::role::openldap::management
+ include ::ldap::role::client::labs
}
--
To view, visit https://gerrit.wikimedia.org/r/350380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31532df5a5978394c9aca5c1f6f8e26ed8ea5e7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
