Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153622
Change subject: remove aluminium from sites.pp and dhcp config
......................................................................
remove aluminium from sites.pp and dhcp config
Change-Id: I9fe8a306ff9360acc89a98eca88826ddd784e5f7
---
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/153622/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 36f8dbc..2f4b023 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1041,10 +1041,6 @@
include role::poolcounter
}
-node 'aluminium.wikimedia.org' {
- include admin
-}
-
# erbium is a webrequest udp2log host
node 'erbium.eqiad.wmnet' inherits 'base_analytics_logging_node' {
# gadolinium hosts the separate nginx webrequest udp2log instance.
@@ -2886,8 +2882,9 @@
}
}
-# as of 2013-11-18 these fundraising servers use frack puppet
+# as of 2014-08-12 these fundraising servers use frack puppet
#
+# aluminium.frack.eqiad.wmnet
# barium.frack.eqiad.wmnet
# boron.frack.eqiad.wmnet
# db1008.frack.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 9596d5e..dda28d5 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3,11 +3,6 @@
#### puppet:///modules/install-server/dhcpd/linux-host-entries.ttyS1-115200
######################################################################
-host aluminium {
- hardware ethernet d4:ae:52:65:05:2a;
- fixed-address aluminium.wikimedia.org;
-}
-
host amslvs1 {
hardware ethernet a4:ba:db:38:e2:5e;
fixed-address amslvs1.esams.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/153622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fe8a306ff9360acc89a98eca88826ddd784e5f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
