diff --git a/puppet/zulip_ops/files/postgresql/setup_disks.sh b/puppet/zulip_ops/files/postgresql/setup_disks.sh index 5e16c6887b..28c5b1ac62 100755 --- a/puppet/zulip_ops/files/postgresql/setup_disks.sh +++ b/puppet/zulip_ops/files/postgresql/setup_disks.sh @@ -1,18 +1,11 @@ #!/bin/sh umount /mnt -yes | mdadm --create /dev/md0 --raid-devices=2 --level=1 /dev/xvdb /dev/xvdc -# Add disk to mdadm.conf so it will be enabled on boot -mdadm --examine --scan | sed 's/ metadata=1.2//; s/ name.*//; s|md/0|md0|' >> /etc/mdadm/mdadm.conf -blockdev --setra 4096 /dev/xvdb -blockdev --setra 4096 /dev/xvdc -blockdev --setra 4096 /dev/md0 -echo deadline > /sys/block/xvdb/queue/scheduler -echo deadline > /sys/block/xvdc/queue/scheduler +LOCALDISK=/dev/nvme0n1 -mkfs.xfs /dev/md0 +mkfs.xfs $LOCALDISK -echo "/dev/md0 /srv xfs nofail,noatime,barrier 1 1" >> /etc/fstab +echo "$LOCALDISK /srv xfs nofail,noatime 1 1" >> /etc/fstab mount /srv # TODO use systemctl instead of pg_ctlcluster on CentOS @@ -30,6 +23,3 @@ pg_ctlcluster 9.5 main start # Disable /mnt line for /dev/xvdb umount /mnt sed -i 's|^/dev/xvdb|#/dev/xvdb|' /etc/fstab - -# Update the initrd so we can use the new array post-boot -update-initramfs -u