Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/126222
Change subject: decom virt5-11, pmtpa compute nodes
......................................................................
decom virt5-11, pmtpa compute nodes
remove from puppet
remove from DHCP
remove from ganglia config
Change-Id: I413779fcd5130fc3103c86bd92a5cc3d0f73c12f
---
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 0 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/126222/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9da45bb..3f6bf21 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -299,7 +299,6 @@
'SSL cluster esams' =>
'hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org
ssl3002.esams.wikimedia.org',
'Swift pmtpa' => 'ms-fe1.pmtpa.wmnet
ms-fe2.pmtpa.wmnet',
'Virtualization cluster eqiad' =>
'labnet1001.eqiad.wmnet virt1000.wikimedia.org',
- 'Virtualization cluster pmtpa' => 'virt5.pmtpa.wmnet
virt0.wikimedia.org',
'Glusterfs cluster pmtpa' => 'labstore1.pmtpa.wmnet
labstore2.pmtpa.wmnet',
'MySQL eqiad' => 'db1056.eqiad.wmnet
db1021.eqiad.wmnet',
'LVS loadbalancers eqiad' => 'lvs1001.wikimedia.org
lvs1002.wikimedia.org',
diff --git a/manifests/site.pp b/manifests/site.pp
index a965d2b..14b7d24 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2808,22 +2808,6 @@
include role::nova::api
}
-node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
- $cluster = 'virt'
- if $::hostname =~ /^virt5$/ {
-
- $ganglia_aggregator = true
- }
-
- $openstack_version = 'folsom'
- $use_neutron = false
-
- include admins::labs
-
- include standard
- include role::nova::compute
-}
-
node 'labnet1001.eqiad.wmnet' {
$cluster = 'virt'
$openstack_version = 'havana'
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index 639368c..bc1d8e8 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -115,41 +115,6 @@
fixed-address virt1009.eqiad.wmnet;
}
-host virt5 {
- hardware ethernet 88:43:e1:c2:86:40;
- fixed-address virt5.pmtpa.wmnet;
-}
-
-host virt6 {
- hardware ethernet 88:43:E1:C2:57:EE;
- fixed-address virt6.pmtpa.wmnet;
-}
-
-host virt7 {
- hardware ethernet 88:43:E1:C2:77:DE;
- fixed-address virt7.pmtpa.wmnet;
-}
-
-host virt8 {
- hardware ethernet 00:22:BD:D3:61:7E;
- fixed-address virt8.pmtpa.wmnet;
-}
-
-host virt9 {
- hardware ethernet 00:22:BD:D3:37:E4;
- fixed-address virt9.pmtpa.wmnet;
-}
-
-host virt10 {
- hardware ethernet 88:43:E1:C2:5D:AC;
- fixed-address virt10.pmtpa.wmnet;
-}
-
-host virt11 {
- hardware ethernet 88:43:E1:C2:4C:56;
- fixed-address virt11.pmtpa.wmnet;
-}
-
host virt15 {
hardware ethernet 88:43:E1:C2:7B:6C;
fixed-address virt15.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/126222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I413779fcd5130fc3103c86bd92a5cc3d0f73c12f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
