Ottomata has submitted this change and it was merged.
Change subject: Remove references to vanadium in order to decomission
......................................................................
Remove references to vanadium in order to decomission
Bug: T95566
Change-Id: I705e948e602145414b2e5fab74e8ccbf7df282fa
---
M manifests/role/cache.pp
M manifests/role/tcpircbot.pp
M manifests/site.pp
M modules/admin/files/enforce-users-groups.sh
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
5 files changed, 3 insertions(+), 29 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f640a5e..70e8c18 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -601,19 +601,6 @@
'labs' => '10.68.16.52', # deployment-eventlogging02
}
- # I am renaming this varnishncsa instance to
- # 'eventlogging'. First ensuring that this is stopped,
- # then I will remove configs.
- varnish::logging { 'vanadium' :
- listener_address => '10.64.21.123', # vanadium
- port => '8422',
- instance_name => '',
- cli_args => '-m RxURL:^/event\.gif\?. -D',
- log_fmt => '%q\t%l\t%n\t%t\t%h\t"%{User-agent}i"',
- monitor => false,
- ensure => 'absent',
- }
-
varnish::logging { 'eventlogging' :
listener_address => $event_listener,
port => '8422',
diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 9658ced..a120ee7 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -23,7 +23,7 @@
}
ferm::rule { 'tcpircbot_allowed':
- # Vanadium, eventlog1001, tin(v4), localhost, tin (v6)
- rule => 'proto tcp dport 9200 { saddr (10.64.21.123/32 10.64.32.167/32
10.64.0.196/32 127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
+ # eventlog1001, tin(v4), localhost, tin (v6)
+ rule => 'proto tcp dport 9200 { saddr (10.64.32.167/32 10.64.0.196/32
127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index d46311b..487f039 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2352,14 +2352,6 @@
}
}
-# This node will soon be deprecated.
-node 'vanadium.eqiad.wmnet' {
- role eventlogging
- include standard
- include role::ipython_notebook
- include role::logging::mediawiki::errors
-}
-
node 'virt1000.wikimedia.org' {
$cluster = 'virt'
$ganglia_aggregator = true
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 0119699..8ba76ab 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -11,7 +11,7 @@
EXCLUDE=("nobody" \
"l10nupdate" \
"gmetric" \ # nescio.wikimedia.org
- "mwdeploy" \ # vanadium.eqiad.wmnet,eventlog*
+ "mwdeploy" \ # eventlog*
"gerrit2" \ # ytterbium.wikimedia.org
"spamd" \ # sodium.wikimedia.org:
"mwprof" \ # tungsten.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 a4637df..81165ce 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5639,11 +5639,6 @@
fixed-address uranium.wikimedia.org;
}
-host vanadium {
- hardware ethernet 78:2b:cb:08:a4:3b;
- fixed-address vanadium.eqiad.wmnet;
-}
-
host virt1000 {
hardware ethernet 18:03:73:f5:2c:2b;
fixed-address virt1000.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/203091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I705e948e602145414b2e5fab74e8ccbf7df282fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
