[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove stat1002 from puppet as part of decom process
Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371486 )
Change subject: Remove stat1002 from puppet as part of decom process
..
Remove stat1002 from puppet as part of decom process
Bug: T152712
Change-Id: I4e6eb7e66f21a57f182ffe22b842da5084733ec1
---
D hieradata/hosts/stat1002.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/analytics_cluster/hadoop/client.pp
M modules/statistics/manifests/wmde/graphite.pp
6 files changed, 4 insertions(+), 66 deletions(-)
Approvals:
Elukey: Verified; Looks good to me, approved
diff --git a/hieradata/hosts/stat1002.yaml b/hieradata/hosts/stat1002.yaml
deleted file mode 100644
index 8497a79..000
--- a/hieradata/hosts/stat1002.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-cluster: analytics
-admin::groups:
- - statistics-privatedata-users
- - statistics-admins
- - analytics-privatedata-users
- - analytics-admins
- # elasticsearch::analytics creates the analytics-search user and group
- # that analytics-search-users are allowed to sudo to. This is used
- # for deploying files to HDFS.
- - analytics-search-users
- - analytics-wmde-users
-debdeploy::grains:
- debdeploy-stat:
-value: standard
diff --git a/manifests/site.pp b/manifests/site.pp
index d3c1c62..db9f8af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,7 +1834,6 @@
include ::standard
}
node 'notebook1002.eqiad.wmnet' {
-# Equivalent to stat1002
role(paws_internal::jupyterhub, analytics_cluster::client)
include ::standard
}
@@ -2156,41 +2155,6 @@
# Failoid service (Ganeti VM)
node 'tureis.codfw.wmnet' {
role(failoid)
-}
-
-# stat1002 is intended to be the private data analytics compute node.
-# Users should not use it for app development.
-# Data processing on this machine is fine.
-# NOTE: This node is being deprecated and decomissioned as part of T152712.
-node 'stat1002.eqiad.wmnet' {
-role(
-# This is also a Hadoop client, and should
-# have any special analytics system users on it
-# for interacting with HDFS.
-analytics_cluster::users,
-
-# Include Hadoop and other analytics cluster
-# clients so that analysts can access Hadoop
-# from here.
-analytics_cluster::client,
-
-# Include analytics/refinery deployment target.
-analytics_cluster::refinery,
-
-# Include analytics/refinery checks that send email about
-# webrequest partitions faultyness.
-# MOVED TO stat1005
-# analytics_cluster::refinery::job::data_check,
-
-# Include analytics/refinery/source guard checks
-# Disabled due to T166937
-# analytics_cluster::refinery::job::guard,
-
-# Deploy wikimedia/discovery/analytics repository
-# to this node.
-elasticsearch::analytics)
-
-include ::standard
}
# stat1003 is a general purpose number cruncher for
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 1081837..d42515f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -58,7 +58,7 @@
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
boron) echo partman/lvm.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
-
lawrencium|notebook1001|notebook1002|stat1002|tungsten|labsdb1009|labsdb101[0-1])
echo partman/db.cfg ;; \
+
lawrencium|notebook1001|notebook1002|tungsten|labsdb1009|labsdb101[0-1]) echo
partman/db.cfg ;; \
stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
conf100[1-6]) echo partman/raid1-lvm-conf.cfg ;; \
@@ -161,7 +161,6 @@
sarin) echo partman/raid1-lvm-ext4-srv.cfg ;; \
snapshot1001) echo partman/snapshot.cfg ;; \
snapshot100[5-7]) echo partman/lvm-ext-srv.cfg ;; \
-stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
tin) echo partman/lvm-tin.cfg ;; \
thumbor*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
wdqs100[1-3]|wdqs200[1-3]) echo partman/lvm-ext-srv.cfg ;; \
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 6818d06..d7b0464 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6199,13 +6199,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host stat1002 {
-hardware ethernet 78:2b:cb:0a:0e:fc;
-fixed-address stat1002.eqiad.wmnet;
-option
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove stat1002 from puppet as part of decom process
Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371486 )
Change subject: Remove stat1002 from puppet as part of decom process
..
Remove stat1002 from puppet as part of decom process
Bug: 368612
Change-Id: I4e6eb7e66f21a57f182ffe22b842da5084733ec1
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/analytics_cluster/hadoop/client.pp
M modules/statistics/manifests/wmde/graphite.pp
5 files changed, 4 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/371486/1
diff --git a/manifests/site.pp b/manifests/site.pp
index d3c1c62..db9f8af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,7 +1834,6 @@
include ::standard
}
node 'notebook1002.eqiad.wmnet' {
-# Equivalent to stat1002
role(paws_internal::jupyterhub, analytics_cluster::client)
include ::standard
}
@@ -2156,41 +2155,6 @@
# Failoid service (Ganeti VM)
node 'tureis.codfw.wmnet' {
role(failoid)
-}
-
-# stat1002 is intended to be the private data analytics compute node.
-# Users should not use it for app development.
-# Data processing on this machine is fine.
-# NOTE: This node is being deprecated and decomissioned as part of T152712.
-node 'stat1002.eqiad.wmnet' {
-role(
-# This is also a Hadoop client, and should
-# have any special analytics system users on it
-# for interacting with HDFS.
-analytics_cluster::users,
-
-# Include Hadoop and other analytics cluster
-# clients so that analysts can access Hadoop
-# from here.
-analytics_cluster::client,
-
-# Include analytics/refinery deployment target.
-analytics_cluster::refinery,
-
-# Include analytics/refinery checks that send email about
-# webrequest partitions faultyness.
-# MOVED TO stat1005
-# analytics_cluster::refinery::job::data_check,
-
-# Include analytics/refinery/source guard checks
-# Disabled due to T166937
-# analytics_cluster::refinery::job::guard,
-
-# Deploy wikimedia/discovery/analytics repository
-# to this node.
-elasticsearch::analytics)
-
-include ::standard
}
# stat1003 is a general purpose number cruncher for
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 1081837..d42515f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -58,7 +58,7 @@
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
boron) echo partman/lvm.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
-
lawrencium|notebook1001|notebook1002|stat1002|tungsten|labsdb1009|labsdb101[0-1])
echo partman/db.cfg ;; \
+
lawrencium|notebook1001|notebook1002|tungsten|labsdb1009|labsdb101[0-1]) echo
partman/db.cfg ;; \
stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
conf100[1-6]) echo partman/raid1-lvm-conf.cfg ;; \
@@ -161,7 +161,6 @@
sarin) echo partman/raid1-lvm-ext4-srv.cfg ;; \
snapshot1001) echo partman/snapshot.cfg ;; \
snapshot100[5-7]) echo partman/lvm-ext-srv.cfg ;; \
-stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
tin) echo partman/lvm-tin.cfg ;; \
thumbor*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
wdqs100[1-3]|wdqs200[1-3]) echo partman/lvm-ext-srv.cfg ;; \
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 6818d06..d7b0464 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6199,13 +6199,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host stat1002 {
-hardware ethernet 78:2b:cb:0a:0e:fc;
-fixed-address stat1002.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host stat1003 {
hardware ethernet F0:1F:AF:E8:BA:E3;
fixed-address stat1003.eqiad.wmnet;
diff --git a/modules/role/manifests/analytics_cluster/hadoop/client.pp
b/modules/role/manifests/analytics_cluster/hadoop/client.pp
index 54a0e42..4ade4a0 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/client.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/client.pp
@@ -85,12 +85,8 @@
include ::profile::hadoop::logstash
-# Include ores::base class to get dependencies for using ORES in Hadoop.
-# NOTE:
