Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392400 )
Change subject: mariadb: Leave reimaginable only the db latest servers
......................................................................
mariadb: Leave reimaginable only the db latest servers
Remove from the list of servers reimaginable with /srv loss the
all but:
* servers >= db1109
* servers >= db2071
* servers labsdb1009, 10 and 11
db1059 was already reimagined at T175679.
Other movements done as part of a first clean up, but it needs
deeper refactoring to keep the alphabetical ordering.
Bug: T170662
Change-Id: I58566e209fbc7a0fc76719639ed8a7985fde97f4
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 1fb4c8f..fa06ae1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -58,15 +58,15 @@
bast4002|dns400[12]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
-
lawrencium|notebook1001|notebook1002|tungsten|labsdb1009|labsdb101[0-1]|labvirt1019|labvirt1020)
echo partman/db.cfg ;; \
+ lawrencium|notebook1001|notebook1002|tungsten|labvirt1019|labvirt1020)
echo partman/db.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
conf100[1-6]) echo partman/raid1-lvm-conf.cfg ;; \
conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
- db1059|db109[6-9]|db110[0-9]|db111[0-2]) echo partman/db.cfg ;; \
+ db1109|db111[0-9]) echo partman/db.cfg ;; \
db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
-
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db110[78]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
echo partman/db-no-srv-format.cfg ;; \
+ db[12][01][0-9][0-9]|dbstore[12]00[1-9]|es[12]01[1-9]) echo
partman/db-no-srv-format.cfg ;; \
deploy[12]001|flerovium|furud) echo
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
d-i-test) echo partman/flat.cfg virtual.cfg ;; \
druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \
@@ -82,7 +82,7 @@
kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
francium|tegmen) echo partman/raid10-gpt.cfg ;; \
-
gerrit2001|labtestnet2002|lawrencium|labtestneutron2002|netmon1002|netmon2001|phab1001)
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
+ gerrit2001) echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
ganeti100[1-4]) echo partman/ganeti-raid1.cfg ;; \
ganeti100[5-8]) echo partman/ganeti.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
@@ -97,11 +97,12 @@
labnet100[1-2]) echo partman/lvm.cfg ;; \
labsdb100[45]) echo partman/osmlabsdb.cfg ;; \
labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \
- labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \
+ labsdb1009|labsdb101[0-1]) echo partman/db-no-srv-format.cfg ;; \
sodium) echo partman/lvm-ext-srv.cfg ;; \
labpuppetmaster100[12]|labnet100[34]|labnodepool1002|labweb100[12])
echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
labstore100[1-2]) echo partman/labstore-lvm-noraid-swap.cfg ;; \
labstore200[1-4]) echo partman/labstore-lvm-noraid.cfg ;; \
+
labtestnet2002|lawrencium|labtestneutron2002|netmon1002|netmon2001|phab1001)
echo partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
labtestneutron2001) echo partman/mw.cfg ;; \
labtestnet2001) echo partman/raid1.cfg ;; \
labtestpuppetmaster2001|labtestcontrol2003|labtestservices2002|labtestservices2003|labtestmetal2001)
echo partman/raid1-lvm-ext4-srv.cfg ;; \
--
To view, visit https://gerrit.wikimedia.org/r/392400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58566e209fbc7a0fc76719639ed8a7985fde97f4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
