RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/118010
Change subject: reclaim arsenic as spare ...................................................................... reclaim arsenic as spare arsenic can be reclaimed into spare pool Change-Id: I4ad291b35f6e99bcddc5199937db1266de36dca4 RT: 6522 --- M files/dsh/group/ALL M files/dsh/group/mediawiki-installation M files/dsh/group/misc_eqiad M files/dsh/group/mw-eqiad M manifests/decommissioning.pp M manifests/site.pp M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 7 files changed, 1 insertion(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/118010/1 diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index 77f3149..87133c2 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -1,4 +1,3 @@ -arsenic dataset2 dataset1001 hume diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index 264a936..7d564cc 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -1,4 +1,3 @@ -arsenic searchidx2 searchidx1001 fenari diff --git a/files/dsh/group/misc_eqiad b/files/dsh/group/misc_eqiad index 6a2b385..0b96e81 100644 --- a/files/dsh/group/misc_eqiad +++ b/files/dsh/group/misc_eqiad @@ -1,6 +1,5 @@ aluminium antimony -arsenic calcium carbon cerium diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad index 5c6ce6e..6023844 100644 --- a/files/dsh/group/mw-eqiad +++ b/files/dsh/group/mw-eqiad @@ -1,4 +1,3 @@ -arsenic bast1001 mw1001 mw1002 diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp index b768c77..e63a627 100644 --- a/manifests/decommissioning.pp +++ b/manifests/decommissioning.pp @@ -8,6 +8,7 @@ 'analytics1005', #renamed virt1003 'analytics1006', #renamed virt1008 'analytics1008', #renamed virt1009 +'arsenic', 'br1-knams', 'controller', 'cp1021', # cp 1021-1042 were reclaimed, 5981 diff --git a/manifests/site.pp b/manifests/site.pp index 5dbed37..3c356d1 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -221,29 +221,6 @@ } } -node 'arsenic.eqiad.wmnet' { - include role::applicationserver::maintenance - include role::db::maintenance - include misc::deployment::scap_scripts - include admins::roots - include admins::mortals - include generic::wikidev-umask - include nrpe - include accounts::demon - include groups::wikidev - - # rt 6189: temporary root for testing - sudo_user { 'demon': - privileges => ['ALL = NOPASSWD: ALL'], - } - - #just adding this for the mediawiki require - class { 'misc::maintenance::pagetriage': - enabled => false, - } -} - - node 'bast1001.wikimedia.org' { system::role { 'misc': description => 'Bastion Server', 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 d5d4df8..1b233ae 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -279,11 +279,6 @@ fixed-address antimony.wikimedia.org; } -host arsenic { - hardware ethernet 18:03:73:f1:4f:5e; - fixed-address arsenic.eqiad.wmnet; -} - host backup4001 { hardware ethernet F0:1F:AF:D8:72:9A; fixed-address backup4001.ulsfo.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/118010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ad291b35f6e99bcddc5199937db1266de36dca4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH <r...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits