Dzahn has submitted this change and it was merged.

Change subject: partman: delete some more unused recipes
......................................................................


partman: delete some more unused recipes

To start reducing the number of different partman
recipes we have (as Brandon pointed out it's like 57(!sic),
detecting the recipes that are not used in netboot.cfg
and deleting them.

Used this:

~/wmf/puppet/modules/install_server/files/autoinstall/partman$

for recipe in *.cfg; do
 if ! grep -q $recipe ../netboot.cfg;
 then echo "$recipe not used"; git rm $recipe; fi; done

I already deleted some for cassandra hosts in I352b73878036dbc4,
rebased on that, these are left now:

analytics-cisco.cfg not used
rm 'modules/install_server/files/autoinstall/partman/analytics-cisco.cfg'

lvm-etcd.cfg not used
rm 'modules/install_server/files/autoinstall/partman/lvm-etcd.cfg'

raid0-lvm.cfg not used
rm 'modules/install_server/files/autoinstall/partman/raid0-lvm.cfg'

raid1-squid.cfg not used
rm 'modules/install_server/files/autoinstall/partman/raid1-squid.cfg'

raid5-gpt.cfg not used
rm 'modules/install_server/files/autoinstall/partman/raid5-gpt.cfg'

Change-Id: Ic05660855aab95e91909425f8548f9e9215ef642
---
D modules/install_server/files/autoinstall/partman/lvm-etcd.cfg
D modules/install_server/files/autoinstall/partman/raid0-lvm.cfg
D modules/install_server/files/autoinstall/partman/raid1-squid.cfg
D modules/install_server/files/autoinstall/partman/raid5-gpt.cfg
4 files changed, 0 insertions(+), 257 deletions(-)

Approvals:
  Papaul: Looks good to me, approved
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/install_server/files/autoinstall/partman/lvm-etcd.cfg 
b/modules/install_server/files/autoinstall/partman/lvm-etcd.cfg
deleted file mode 100644
index ee8f588..0000000
--- a/modules/install_server/files/autoinstall/partman/lvm-etcd.cfg
+++ /dev/null
@@ -1,65 +0,0 @@
-# Partman recipe for etcd servers
-#
-# configuration to create:
-#  * no RAID (either single disk or hardware raid presenting a single device)
-#  * 300M on /boot outside of LVM
-#  * the rest formatted with LVM
-#  ** 40G /
-#  ** 8G swap
-#  ** 60G /var
-
-d-i    partman-auto/method     string  lvm
-d-i    partman-auto/disk       string  /dev/sda
-
-# the install makes sure we want to wipe the lvm
-d-i    partman-lvm/device_remove_lvm   boolean true
-d-i    partman-lvm/confirm     boolean true
-d-i    partman-lvm/confirm_nooverwrite true
-
-d-i    partman/confirm_nooverwrite     true
-d-i    partman/choose_partition        select  finish
-
-# Don't stop if method isn't provided, e.g. in non used LVs
-d-i    partman-basicmethods/method_only        boolean false
-
-d-i    partman-auto/expert_recipe      string  lvm ::  \
-               40 300 300 ext4 \
-                       $primary{ }     \
-                       $bootable{ }    \
-                       method{ format }        \
-                       format{ }       \
-                       use_filesystem{ }       \
-                       filesystem{ ext4 }      \
-                       mountpoint{ /boot }     \
-               .       \
-               40000 40000 40000 ext4  \
-                       $lvmok{ }       \
-                       method{ format }        \
-                       format{ }       \
-                       use_filesystem{ }       \
-                       filesystem{ ext4 }      \
-                       mountpoint{ / } \
-               .       \
-               8000 8000 8000 linux-swap       \
-                       method{ swap }  \
-                       $lvmok{ }       \
-                       format{ }       \
-               .       \
-               60000 60000 60000 ext4  \
-                       $lvmok{ }       \
-                       method{ format }        \
-                       format{ }       \
-                       use_filesystem{ }       \
-                       filesystem{ ext4 }      \
-                       mountpoint{ /var }      \
-               .       \
-               5000    200     -1      ext4    \
-                       $defaultignore{ }               \
-                       $lvmok{ } lv_name{ _placeholder }       \
-                       method{ keep }          \
-               .
-
-d-i    partman-auto-lvm/guided_size    string  80%
-
-d-i    partman-auto/choose_recipe      lvm
-
diff --git a/modules/install_server/files/autoinstall/partman/raid0-lvm.cfg 
b/modules/install_server/files/autoinstall/partman/raid0-lvm.cfg
deleted file mode 100644
index f0616ac..0000000
--- a/modules/install_server/files/autoinstall/partman/raid0-lvm.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-# Automatic software RAID partitioning
-#
-# * 4 disks, sda, sdb, sdc, sdd
-# * LVM
-# * GPT layout (large disks, > 2TB)
-# * layout:
-#   - /boot:      RAID1, 500MB
-#   - /        :   ext3, RAID0, 50GB on LVM
-#   - swap:      RAID0, 1G on LVM
-#   - rest is lvm RAID0
-
-d-i    partman-auto/method             string  raid
-d-i    partman-md/device_remove_md     boolean true
-d-i    partman-lvm/device_remove_lvm   boolean true
-
-# Use the first two disks
-d-i    partman-auto/disk       string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
-
-# Don't stop if method isn't provided, e.g. in non used LVs
-d-i    partman-basicmethods/method_only        boolean false
-
-# Define physical partitions
-d-i    partman-auto/expert_recipe      string  \
-               multiraid ::    \
-                       10      1       10      grub            \
-                               $gptonly{ }                     \
-                               $bios_boot{ }                   \
-                               $primary{ } method{ biosgrub }  \
-                       .                                       \
-                       500     1       500     raid            \
-                               $primary{ } method{ raid }      \
-                               $lvmignore{ }                   \
-                       .                                       \
-                       500     2       -1      raid            \
-                               $primary{ } method{ raid }      \
-                               $lvmignore{ }                   \
-                       .                                       \
-                       50000   4       50000  ext3             \
-                                       $lvmok{ }               \
-                                       $defaultignore{ }       \
-                                       lv_name{ root }         \
-                                       method{ format }        \
-                                       format{ }               \
-                                       use_filesystem{ }       \
-                                       filesystem{ ext3 }      \
-                                       mountpoint{ / }         \
-                       .                                       \
-                       1000    3       1000    linux-swap      \
-                               $defaultignore{ }               \
-                               $lvmok{ }                       \
-                               lv_name{ swap }                 \
-                               method{ swap }                  \
-                               format{ }                       \
-                       .               \
-                       5000    200     -1      ext4    \
-                               $defaultignore{ }               \
-                               $lvmok{ } lv_name{ _placeholder }       \
-                               method{ keep }          \
-                       .
-
-
-
-# Parameters are:
-# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-#      <devices> <sparedevices>
-d-i    partman-auto-raid/recipe        string          \
-               1       4       0       ext3    /boot   \
-                       /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2         \
-               .                                       \
-               0       4       0       lvm     -       \
-                       /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3         \
-               .
-
-d-i    partman-md/confirm              boolean true
-d-i    partman-md/confirm_nooverwrite  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  80%
-d-i    partman-lvm/confirm             boolean true
-d-i    partman-lvm/confirm_nooverwrite boolean true
-d-i    partman-lvm/device_remove_lvm   boolean true
-d-i    mdadm/boot_degraded             boolean true
diff --git a/modules/install_server/files/autoinstall/partman/raid1-squid.cfg 
b/modules/install_server/files/autoinstall/partman/raid1-squid.cfg
deleted file mode 100644
index 7cca59b..0000000
--- a/modules/install_server/files/autoinstall/partman/raid1-squid.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-# Automatic software RAID partitioning
-#
-# * two disks, sda & sdb
-# * primary & extended partitions, no LVM
-# * layout:
-#   - /          : ext3, RAID1, 10GB
-#   - swap: RAID1, 1GB
-#   - one extended partition per disk (sda5/sdb5) for the rest,
-#     used as a squid coss disk
-#
-#   NOTE:  The extended partition is marked as 'linux-swap' only
-#   to convince partman to not touch the parition once it is created.
-
-d-i    partman-auto/method             string  raid
-d-i    partman-md/device_remove_md     boolean true
-d-i    partman-lvm/device_remove_lvm   boolean true
-
-# Use the first two disks
-d-i    partman-auto/disk       string  /dev/sda /dev/sdb
-
-# method{ keep } on a partition that has no known filesystem
-# produces a "No file system is specified for partition" prompt; silence it
-d-i    partman-basicmethods/method_only        boolean false
-
-# Define physical partitions
-d-i    partman-auto/expert_recipe      string  \
-               multiraid ::    \
-                       5000    8000    10000   raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       1000    1000    1000    raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       1000    1000    -1      linux-swap      \
-                               method{ keep }                  \
-                       .
-
-# 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       swap    -       \
-                       /dev/sda2#/dev/sdb2             \
-               .
-
-d-i    partman-md/confirm              boolean true
-d-i    partman-md/confirm_nooverwrite  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
diff --git a/modules/install_server/files/autoinstall/partman/raid5-gpt.cfg 
b/modules/install_server/files/autoinstall/partman/raid5-gpt.cfg
deleted file mode 100644
index 341f863..0000000
--- a/modules/install_server/files/autoinstall/partman/raid5-gpt.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Automatic software RAID partitioning
-#
-# * 4 disks, sda, sdb, sdc, sdd
-# * primary partitions
-# * GPT layout (large disks, > 2TB)
-# * layout:
-#   - swap:       RAID1, 1GB
-#   - /boot:   ext3, RAID1, 500MB
-#   - /: ext3, RAID5, rest of the space
-
-d-i    partman-auto/method             string  raid
-d-i    partman-md/device_remove_md     boolean true
-d-i    partman-lvm/device_remove_lvm   boolean true
-
-# Use the first two disks
-d-i    partman-auto/disk       string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
-
-# Define physical partitions
-d-i    partman-auto/expert_recipe      string  \
-               multiraid ::    \
-                       1       1       1       grub            \
-                               $primary{ } method{ biosgrub }  \
-                       .                                       \
-                       500     800     500     raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       1000    1000    1000    raid            \
-                               $primary{ } method{ raid }      \
-                       .                                       \
-                       50000   80000   -1      raid            \
-                               $primary{ } method{ raid }      \
-                       .
-
-# Parameters are:
-# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-#      <devices> <sparedevices>
-d-i    partman-auto-raid/recipe        string          \
-               1       4       0       ext3    /boot   \
-                       /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2         \
-               .                                       \
-               5       4       0       swap    -       \
-                       /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3         \
-               .                                       \
-               5       4       0       ext3    /       \
-                       /dev/sda4#/dev/sdb4#/dev/sdc4#/dev/sdd4         \
-               .
-
-d-i    partman-md/confirm              boolean true
-d-i    partman-md/confirm_nooverwrite  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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic05660855aab95e91909425f8548f9e9215ef642
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Papaul <ptshiba...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to