Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201395

Change subject: remove haedus,capella from hiera, DHCP, netboot
......................................................................

remove haedus,capella from hiera, DHCP, netboot

These have been used for testing orientdb but that
test is over now.

This assumes they are not coming back with the same name
but are repurposed and will get new names.

Bug:T94474
Change-Id: I3baeb3253ec467caff08d4612de2dcc6b30ef840
---
M hieradata/regex.yaml
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/201395/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 0a69362..f9f2dd5 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -34,11 +34,6 @@
   __regex: !ruby/regexp /stat100[123].eqiad.wmnet/
   mainrole: statistics
 
-orientdb_test:
-  __regex: !ruby/regexp /^(haedus|capella)\.codfw\.wmnet$/
-  admin::groups:
-    - wikidata-query-roots
-
 cassandra_test:
   __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/
   cassandra::seeds:
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index f6d5452..ab755d3 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -51,7 +51,7 @@
                analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
                analytics102[8-9]|analytics103[0-9]|analytics104[0-1]) echo 
partman/analytics-flex.cfg ;; \
                
db[0-8][0-9]|db10[0-7][0-9]|db20[0-2][0-9]|db2030|db203[3-9]|db204[0-2]|dbstore[1-2]00[1-9]|es[1-2]0[0-2][0-9])
 echo partman/db.cfg ;; \
-               capella|haedus|netmon1001|stat1002|tungsten) echo 
partman/db.cfg ;; \
+               netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \
                bast*) echo partman/lvm.cfg ;; \
                boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
                calcium|helium|potassium|tmh1001|tmh1002) echo 
partman/raid1-1partition.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 fa9e22e..b39a0da 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -469,11 +469,6 @@
        fixed-address californium.wikimedia.org;
 }
 
-host capella {
-       hardware ethernet 90:B1:1C:23:20:4D;
-       fixed-address capella.codfw.wmnet;
-}
-
 host carbon {
        hardware ethernet 78:2b:cb:09:0e:a0;
        fixed-address carbon.wikimedia.org;
@@ -2123,11 +2118,6 @@
 host graphite2001 {
        hardware ethernet B0:83:FE:DF:24:CA;
        fixed-address graphite2001.codfw.wmnet;
-}
-
-host haedus {
-       hardware ethernet 90:B1:1C:23:31:85;
-       fixed-address haedus.codfw.wmnet;
 }
 
 host hafnium {

-- 
To view, visit https://gerrit.wikimedia.org/r/201395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3baeb3253ec467caff08d4612de2dcc6b30ef840
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

Reply via email to