RobH has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353116 )
Change subject: decommission mira
......................................................................
decommission mira
out of warranty host, no longer in service for deployment master,
replaced by naos.
removal of all old puppet references
Bug:T164588
Change-Id: Iaa81d059c1105897edbeedf9c64d7cb2b81d22d6
---
M hieradata/common/scap/dsh.yaml
M manifests/site.pp
M modules/network/manifests/constants.pp
M modules/role/manifests/salt/masters/production.pp
M modules/role/templates/mariadb/grants/wikitech.sql.erb
M modules/scap/manifests/master.pp
6 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
RobH: Looks good to me, approved
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index d1f20ef..fa78973 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -13,7 +13,6 @@
scap::dsh::scap_masters:
- "tin.eqiad.wmnet"
- - "mira.codfw.wmnet"
- "naos.codfw.wmnet"
@@ -28,7 +27,6 @@
- {'cluster': 'testserver', 'service': 'apache2'}
hosts:
- tin.eqiad.wmnet
- - mira.codfw.wmnet
- naos.codfw.wmnet
- terbium.eqiad.wmnet
- wasat.codfw.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index 69ed98e..cdfa913 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2673,7 +2673,7 @@
}
# deployment servers
-node 'tin.eqiad.wmnet', 'mira.codfw.wmnet', 'naos.codfw.wmnet' {
+node 'tin.eqiad.wmnet', 'naos.codfw.wmnet' {
role(deployment_server)
}
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index db3da6a..72baa77 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -53,8 +53,6 @@
'deployment_hosts' => [
'10.64.0.196', # tin.eqiad.wmnet
'2620:0:861:101:10:64:0:196', # tin.eqiad.wmnet
- '10.192.16.132', # mira.codfw.wmnet
- '2620:0:860:102:10:192:16:132', # mira.codfw.wmnet
'10.192.32.22', # naos.codfw.wmnet
'2620:0:860:103:10:192:32:22', # naos.codfw.wmnet
],
diff --git a/modules/role/manifests/salt/masters/production.pp
b/modules/role/manifests/salt/masters/production.pp
index 7c4ab13..3b3ebf8 100644
--- a/modules/role/manifests/salt/masters/production.pp
+++ b/modules/role/manifests/salt/masters/production.pp
@@ -12,7 +12,6 @@
salt_runner_dirs => ['/srv/runners'],
salt_peer_run => {
'tin.eqiad.wmnet' => ['deploy.*'],
- 'mira.codfw.wmnet' => ['deploy.*'],
'naos.codfw.wmnet' => ['deploy.*'],
'puppetmaster1001.eqiad.wmnet' => ['keys.*', 'test.*'],
'puppetmaster2001.codfw.wmnet' => ['keys.*', 'test.*'],
diff --git a/modules/role/templates/mariadb/grants/wikitech.sql.erb
b/modules/role/templates/mariadb/grants/wikitech.sql.erb
index 4ba5364..fd05131 100644
--- a/modules/role/templates/mariadb/grants/wikitech.sql.erb
+++ b/modules/role/templates/mariadb/grants/wikitech.sql.erb
@@ -4,12 +4,6 @@
ON `labswiki`.* TO 'wikiadmin'@'10.64.0.196'
IDENTIFIED BY '<%= @wikiadmin_pass %>';
--- queries from mira
-
-GRANT ALL PRIVILEGES
- ON `labswiki`.* TO 'wikiadmin'@'10.192.16.132'
- IDENTIFIED BY '<%= @wikiadmin_pass %>';
-
-- queries from naos
GRANT ALL PRIVILEGES
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index d82945d..dfab01d 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -1,6 +1,6 @@
# = class: scap::master
#
-# Sets up a scap master (currently tin and mira)
+# Sets up a scap master (currently tin and naos)
class scap::master(
$common_path = '/srv/mediawiki',
$common_source_path = '/srv/mediawiki-staging',
--
To view, visit https://gerrit.wikimedia.org/r/353116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa81d059c1105897edbeedf9c64d7cb2b81d22d6
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
