Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: decommission mw1152
......................................................................
mediawiki: decommission mw1152
Also, substitute it with wasat where appropriate
Bug: T149185
Change-Id: Ic010915a79ae983bc1e321d02c60505ac2dc3e64
---
M hieradata/common/scap/dsh.yaml
D hieradata/hosts/mw1152.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/mariadb.pp
M templates/mariadb/grants-wikitech.sql.erb
6 files changed, 5 insertions(+), 52 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index 385a600..825c365 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -35,7 +35,6 @@
- snapshot1005.eqiad.wmnet
- snapshot1006.eqiad.wmnet
- snapshot1007.eqiad.wmnet
- - mw1152.eqiad.wmnet
parsoid:
conftool:
- {'cluster': 'parsoid', 'service': 'parsoid'}
@@ -56,4 +55,3 @@
- mw1263.eqiad.wmnet
- mw1264.eqiad.wmnet
- mw1265.eqiad.wmnet
-
diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml
deleted file mode 100644
index a1e54de..0000000
--- a/hieradata/hosts/mw1152.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-admin::groups:
- - restricted
- - deployment
- - ldap-admins
-base::resolving::domain_search:
- - wikimedia.org
- - eqiad.wmnet
- - codfw.wmnet
-mediawiki::maintenance::pagetriage::ensure: absent
-mediawiki::maintenance::translationnotifications::ensure: absent
-mediawiki::maintenance::updatetranslationstats::ensure: absent
-mediawiki::maintenance::wikidata::ensure: absent
-mediawiki::maintenance::echo_mail_batch::ensure: absent
-mediawiki::maintenance::parsercachepurging::ensure: absent
-mediawiki::maintenance::cleanup_upload_stash::ensure: absent
-mediawiki::maintenance::tor_exit_node::ensure: absent
-mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
-mediawiki::maintenance::refreshlinks::ensure: absent
-mediawiki::maintenance::update_special_pages::ensure: absent
-mediawiki::maintenance::update_article_count::ensure: absent
-mediawiki::maintenance::purge_abusefilter::ensure: absent
-mediawiki::maintenance::purge_checkuser::ensure: absent
-mediawiki::maintenance::purge_securepoll::ensure: absent
-mediawiki::maintenance::jobqueue_stats::ensure: absent
-mediawiki::maintenance::updatequerypages::ensure: absent
-mediawiki::maintenance::cirrussearch::ensure: absent
-tendril::maintenance::ensure: absent
-hhvm::extra::cli:
- hhvm:
- server:
- # Limit number of child processes running at once
- # Also, use light processes, that are more efficient
- light_process_count: 2
diff --git a/manifests/site.pp b/manifests/site.pp
index 0c941f9..4d7fcea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2028,15 +2028,6 @@
include base::firewall
}
-# mw1152 is the experimental HAT script runner
-node 'mw1152.eqiad.wmnet' {
- role(mediawiki::maintenance, mariadb::maintenance,
- mediawiki::generic_monitoring)
- include role::noc::site
- include standard
- include base::firewall
- include ldap::role::client::labs
-}
# mw1161-1169 are job runners
node /^mw116[1-9]\.eqiad\.wmnet$/ {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 04b353a..11b16e9 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3938,11 +3938,6 @@
fixed-address mw1099.eqiad.wmnet;
}
-host mw1152 {
- hardware ethernet 84:2b:2b:77:ea:54;
- fixed-address mw1152.eqiad.wmnet;
-}
-
host mw1161 {
hardware ethernet 90:B1:1C:27:90:98;
fixed-address mw1161.eqiad.wmnet;
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 117d2fb..783f483 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -862,7 +862,7 @@
ferm::service { 'mysql_deployment_terbium':
proto => 'tcp',
port => '3306',
- srange => '@resolve((tin.eqiad.wmnet mira.codfw.wmnet
terbium.eqiad.wmnet mw1152.eqiad.wmnet))',
+ srange => '@resolve((tin.eqiad.wmnet mira.codfw.wmnet
terbium.eqiad.wmnet wasat.codfw.wmnet))',
}
service { 'mariadb':
diff --git a/templates/mariadb/grants-wikitech.sql.erb
b/templates/mariadb/grants-wikitech.sql.erb
index 2b2eb63..b625112 100644
--- a/templates/mariadb/grants-wikitech.sql.erb
+++ b/templates/mariadb/grants-wikitech.sql.erb
@@ -9,11 +9,13 @@
ON `labswiki`.* TO 'wikiadmin'@'10.64.32.13'
IDENTIFIED BY '<%= @wikiadmin_pass %>';
--- queries from mw1152
+-- queries from wasat
+
GRANT ALL PRIVILEGES
- ON `labswiki`.* TO 'wikiadmin'@'10.64.16.132'
+ ON `labswiki`.* TO 'wikiadmin'@'10.192.48.45'
IDENTIFIED BY '<%= @wikiadmin_pass %>';
+
-- queries from horizon.wikimedia.org
GRANT select
ON `labswiki`.* TO 'oathreader'@'208.80.153.248'
--
To view, visit https://gerrit.wikimedia.org/r/318077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic010915a79ae983bc1e321d02c60505ac2dc3e64
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
