Filippo Giunchedi has submitted this change and it was merged. Change subject: lsearchd: reclaim search hosts ......................................................................
lsearchd: reclaim search hosts Bug: T86149 Change-Id: If805f9c012fa3ba5d4fb0f14ebeca381671aee77 --- M modules/install-server/files/autoinstall/netboot.cfg D modules/install-server/files/autoinstall/partman/search.cfg D modules/install-server/files/autoinstall/partman/searchidx.cfg M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 4 files changed, 0 insertions(+), 207 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index df32b63..b2e4929 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -84,8 +84,6 @@ osm-cp*) echo partman/mw.cfg ;; \ pc100[1-3]) echo partman/mw.cfg ;; \ rdb100[1-4]|logstash100[1-3]) echo partman/mw.cfg ;; \ - searchidx*) echo partman/searchidx.cfg ;; \ - search[0-9]*) echo partman/search.cfg ;; \ snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \ stat1002) echo partman/lvm-noraid-large.a.cfg ;; \ argon|bast4001|copper|neon|ruthenium|titanium|ytterbium|zirconium) echo partman/raid1-lvm.cfg ;; \ diff --git a/modules/install-server/files/autoinstall/partman/search.cfg b/modules/install-server/files/autoinstall/partman/search.cfg deleted file mode 100644 index e638359..0000000 --- a/modules/install-server/files/autoinstall/partman/search.cfg +++ /dev/null @@ -1,50 +0,0 @@ -# search server specific configuration - -d-i partman-auto/method string raid -d-i partman-auto/disk string /dev/sda /dev/sdb - -d-i partman/choose_partition select finish - -# Define physical partitions -d-i partman-auto/expert_recipe string \ - search :: \ - 5000 8000 12000 raid \ - $primary{ } $lvmignore{ } method{ raid } \ - . \ - 64 1000 1000000 raid \ - $primary{ } $lvmignore { } method{ raid } \ - . \ - 1000 1000 1000 linux-swap \ - $defaultignore{ } $lvmok{ } \ - lv_name{ swap } method{ swap } format{ } \ - . \ - 64 1000 10000000 xfs \ - $defaultignore{ } $lvmok{ } \ - lv_name{ data } method{ format } format{ } \ - use_filesystem{ } filesystem{ xfs } \ - mountpoint{ /a } \ - . - -# Parameters are: -# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \ -# <devices> <sparedevices> -d-i partman-auto-raid/recipe string \ - 1 2 0 ext3 / \ - /dev/sda1#/dev/sdb1 \ - . \ - 1 2 0 lvm - \ - /dev/sda2#/dev/sdb2 \ - . - - -d-i partman-auto/choose_recipe search - -d-i partman-md/confirm boolean true -d-i partman-md/device_remove_md boolean true -d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -d-i partman-auto-lvm/guided_size string 90% -d-i partman-lvm/device_remove_lvm boolean true diff --git a/modules/install-server/files/autoinstall/partman/searchidx.cfg b/modules/install-server/files/autoinstall/partman/searchidx.cfg deleted file mode 100644 index 7066b31..0000000 --- a/modules/install-server/files/autoinstall/partman/searchidx.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# Application server specific configuration - -# Implementation specific hack: -d-i partman-auto/method string regular -d-i partman-auto/disk string /dev/sda - -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -# Note, expert_recipe wants to fill up the entire disk -# See http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt -d-i partman-auto/expert_recipe string \ - search :: \ - 20000 5000 20000 ext3 \ - $primary{ } $bootable{ } method{ format } \ - format{ } use_filesystem{ } filesystem{ ext3 } \ - mountpoint{ / } \ - . \ - 1000 1000 1000 linux-swap \ - method{ swap } format{ } \ - . \ - 64 1000 10000000 xfs \ - method{ format } format{ } use_filesystem{ } \ - filesystem{ xfs } mountpoint{ /a } \ - . -d-i partman-auto/choose_recipe search - -# Preseeding of other packages -fontconfig fontconfig/enable_bitmaps boolean true 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 1c09626..a94af1e 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -4424,131 +4424,6 @@ fixed-address sca1002.eqiad.wmnet; } -host search1001 { - hardware ethernet 84:2b:2b:77:50:b2; - fixed-address search1001.eqiad.wmnet; -} - -host search1002 { - hardware ethernet 84:2b:2b:77:53:3d; - fixed-address search1002.eqiad.wmnet; -} - -host search1003 { - hardware ethernet 84:2b:2b:77:25:88; - fixed-address search1003.eqiad.wmnet; -} - -host search1004 { - hardware ethernet 84:2b:2b:77:ce:70; - fixed-address search1004.eqiad.wmnet; -} - -host search1005 { - hardware ethernet 84:2b:2b:76:cc:ad; - fixed-address search1005.eqiad.wmnet; -} - -host search1006 { - hardware ethernet 84:2b:2b:77:27:d8; - fixed-address search1006.eqiad.wmnet; -} - -host search1007 { - hardware ethernet 84:2b:2b:77:d1:50; - fixed-address search1007.eqiad.wmnet; -} - -host search1008 { - hardware ethernet 84:2b:2b:77:54:7a; - fixed-address search1008.eqiad.wmnet; -} - -host search1009 { - hardware ethernet 84:2b:2b:76:cc:e0; - fixed-address search1009.eqiad.wmnet; -} - -host search1010 { - hardware ethernet 84:2b:2b:77:d8:e4; - fixed-address search1010.eqiad.wmnet; -} - -host search1011 { - hardware ethernet 84:2b:2b:77:4d:f5; - fixed-address search1011.eqiad.wmnet; -} - -host search1012 { - hardware ethernet 84:2b:2b:77:50:88; - fixed-address search1012.eqiad.wmnet; -} - -host search1013 { - hardware ethernet 84:2b:2b:77:4a:dc; - fixed-address search1013.eqiad.wmnet; -} - -host search1014 { - hardware ethernet 78:2b:cb:16:10:bc; - fixed-address search1014.eqiad.wmnet; -} - -host search1015 { - hardware ethernet 84:2b:2b:77:d0:c5; - fixed-address search1015.eqiad.wmnet; -} - -host search1016 { - hardware ethernet 84:2b:2b:77:d3:84; - fixed-address search1016.eqiad.wmnet; -} - -host search1017 { - hardware ethernet 84:2b:2b:77:d6:3a; - fixed-address search1017.eqiad.wmnet; -} - -host search1018 { - hardware ethernet 84:2b:2b:77:d6:49; - fixed-address search1018.eqiad.wmnet; -} - -host search1019 { - hardware ethernet 84:2b:2b:77:25:1f; - fixed-address search1019.eqiad.wmnet; -} - -host search1020 { - hardware ethernet 84:2b:2b:77:50:bb; - fixed-address search1020.eqiad.wmnet; -} - -host search1021 { - hardware ethernet 84:2b:2b:77:4a:88; - fixed-address search1021.eqiad.wmnet; -} - -host search1022 { - hardware ethernet 84:2b:2b:77:21:c3; - fixed-address search1022.eqiad.wmnet; -} - -host search1023 { - hardware ethernet 84:2b:2b:77:2a:16; - fixed-address search1023.eqiad.wmnet; -} - -host search1024 { - hardware ethernet 84:2b:2b:77:cf:ca; - fixed-address search1024.eqiad.wmnet; -} - -host searchidx1001 { - hardware ethernet 84:2b:2b:fd:a3:01; - fixed-address searchidx1001.eqiad.wmnet; -} - host snapshot1001 { hardware ethernet d0:67:e5:f9:17:a3; fixed-address snapshot1001.eqiad.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/186511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If805f9c012fa3ba5d4fb0f14ebeca381671aee77 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits