Cmjohnson has submitted this change and it was merged.
Change subject: Decom'ing search 21-36 removing from dsh groups and dhcpd
......................................................................
Decom'ing search 21-36 removing from dsh groups and dhcpd
Change-Id: I1c252b310365d845d1d8e381dbe2fbbef2905269
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M files/dsh/group/lucene_pmtpa
M files/dsh/group/search
M files/dsh/group/search_pmtpa
M files/searchqa/lib/searchqa.pm
5 files changed, 5 insertions(+), 164 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index f7021d6..a7cc380 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3832,145 +3832,41 @@
host search13 {
hardware ethernet 00:26:B9:53:54:E2;
fixed-address search13.pmtpa.wmnet;
-
}
host search14 {
hardware ethernet 00:26:B9:53:55:A4;
fixed-address search14.pmtpa.wmnet;
-
}
host search15 {
hardware ethernet 00:26:B9:53:3F:82;
fixed-address search15.pmtpa.wmnet;
-
}
host search16 {
hardware ethernet 00:26:B9:53:55:F5;
fixed-address search16.pmtpa.wmnet;
-
}
host search17 {
hardware ethernet 00:26:B9:53:4F:C4;
fixed-address search17.pmtpa.wmnet;
-
}
host search18 {
hardware ethernet 00:26:B9:53:3E:B5;
fixed-address search18.pmtpa.wmnet;
-
}
host search19 {
hardware ethernet 00:26:B9:53:54:DF;
fixed-address search19.pmtpa.wmnet;
-
}
host search20 {
hardware ethernet 00:26:B9:53:52:32;
fixed-address search20.pmtpa.wmnet;
-
-}
-
-host search21 {
- hardware ethernet d4:ae:52:6e:ea:1c;
- fixed-address search21.pmtpa.wmnet;
-
-}
-
-host search22 {
- hardware ethernet d4:ae:52:6e:ea:4c;
- fixed-address search22.pmtpa.wmnet;
-
-}
-
-host search23 {
- hardware ethernet a4:ba:db:19:cd:29;
- fixed-address search23.pmtpa.wmnet;
-
-}
-
-host search24 {
- hardware ethernet d4:ae:52:6e:f1:15;
- fixed-address search24.pmtpa.wmnet;
-
-}
-
-host search25 {
- hardware ethernet d4:ae:52:70:2d:e3;
- fixed-address search25.pmtpa.wmnet;
-
-}
-
-host search26 {
- hardware ethernet d4:ae:52:6e:e9:e0;
- fixed-address search26.pmtpa.wmnet;
-
-}
-
-host search27 {
- hardware ethernet d4:ae:52:70:2d:19;
- fixed-address search27.pmtpa.wmnet;
-
-}
-
-host search28 {
- hardware ethernet d4:ae:52:6e:e7:7e;
- fixed-address search28.pmtpa.wmnet;
-
-}
-
-host search29 {
- hardware ethernet d4:ae:52:64:da:54;
- fixed-address search29.pmtpa.wmnet;
-
-}
-
-host search30 {
- hardware ethernet d4:ae:52:6e:e3:32;
- fixed-address search30.pmtpa.wmnet;
-
-}
-
-host search31 {
- hardware ethernet d4:ae:52:6a:32:b6;
- fixed-address search31.pmtpa.wmnet;
-
-}
-
-host search32 {
- hardware ethernet d4:ae:52:70:46:da;
- fixed-address search32.pmtpa.wmnet;
-
-}
-
-host search33 {
- hardware ethernet d4:ae:52:6e:dc:73;
- fixed-address search33.pmtpa.wmnet;
-
-}
-
-host search34 {
- hardware ethernet d4:ae:52:64:da:69;
- fixed-address search34.pmtpa.wmnet;
-
-}
-
-host search35 {
- hardware ethernet d4:ae:52:70:2b:f6;
- fixed-address search35.pmtpa.wmnet;
-
-}
-
-host search36 {
- hardware ethernet d4:ae:52:6e:f1:60;
- fixed-address search36.pmtpa.wmnet;
-
}
host search1001 {
diff --git a/files/dsh/group/lucene_pmtpa b/files/dsh/group/lucene_pmtpa
index f05292a..ccf7bb2 100644
--- a/files/dsh/group/lucene_pmtpa
+++ b/files/dsh/group/lucene_pmtpa
@@ -6,19 +6,4 @@
search18
search19
search20
-search21
-search22
-search23
-search24
-search25
-search26
-search27
-search28
-search29
-search30
-search31
-search32
-search33
-search34
-search35
-search36
+
diff --git a/files/dsh/group/search b/files/dsh/group/search
index bac3e21..bd833bb 100644
--- a/files/dsh/group/search
+++ b/files/dsh/group/search
@@ -8,22 +8,6 @@
search18
search19
search20
-search21
-search22
-search23
-search24
-search25
-search26
-search27
-search28
-search29
-search30
-search31
-search32
-search33
-search34
-search35
-search36
search1001
search1002
search1003
diff --git a/files/dsh/group/search_pmtpa b/files/dsh/group/search_pmtpa
index fbd165f..49ff477 100644
--- a/files/dsh/group/search_pmtpa
+++ b/files/dsh/group/search_pmtpa
@@ -7,19 +7,4 @@
search18
search19
search20
-search21
-search22
-search23
-search24
-search25
-search26
-search27
-search28
-search29
-search30
-search31
-search32
-search33
-search34
-search35
-search36
+
diff --git a/files/searchqa/lib/searchqa.pm b/files/searchqa/lib/searchqa.pm
index 2f96f9f..3b14afa 100644
--- a/files/searchqa/lib/searchqa.pm
+++ b/files/searchqa/lib/searchqa.pm
@@ -57,18 +57,9 @@
},
},
'pmtpa' => {
- 'search_pool1' => {
- 'lvs' => [qw(10.2.1.11)],
- 'host' => [qw(search21.pmtpa.wmnet
search22.pmtpa.wmnet search23.pmtpa.wmnet search26.pmtpa.wmnet)],
- },
- 'search_pool2' => {
- 'lvs' => [qw(10.2.1.12)],
- 'host' => [qw(search27.pmtpa.wmnet
search28.pmtpa.wmnet)],
- },
- 'search_pool3' => {
- 'lvs' => [qw(10.2.1.13)],
- 'host' => [qw(search31.pmtpa.wmnet)],
- },
+ 'search_pool1' => {},
+ 'search_pool2' => {},
+ 'search_pool3' => {},
'search_pool4' => {
'lvs' => [qw(10.2.1.14)],
'host' => [qw(search13.pmtpa.wmnet
search14.pmtpa.wmnet)],
--
To view, visit https://gerrit.wikimedia.org/r/92430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c252b310365d845d1d8e381dbe2fbbef2905269
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
