Revert "feat: (IAC-804): Use device UUID in mount to avoid NFS issues due to restarts (#277)" (#279)

riragh · web-flow · commit 67ca32d86d72 · 2023-02-08T10:01:24.000-06:00
This reverts commit 961d243.
diff --git a/files/cloud-init/nfs/cloud-config b/files/cloud-init/nfs/cloud-config
@@ -41,17 +41,17 @@ runcmd:
   #
   # Create Raid5 Array
   #
+  # NOTE: We need to sleep 5 minutes here to ensure the drives have been attached
+  #
+  # - sleep 300
   - pvcreate $(find /dev/disk/azure/scsi1/ -type l | xargs)
   - vgcreate data-vg01 $(find /dev/disk/azure/scsi1/ -type l | xargs)
   - lvcreate --type raid5 --extents 100%FREE --stripes 3 --name data-lv01 data-vg01
   - mkfs -t ext4 /dev/data-vg01/data-lv01
   #
   # Update /etc/fstab
   #
-  - device=`lsblk -r | grep lvm | cut -d " " -f1 | grep -v "_"`
-  - mntDir='/export'
-  - deviceUUID=`sudo blkid /dev/mapper/$device | sed -r 's/.*UUID="([^"]*).*"/\1/g'`
-  - echo "UUID=$deviceUUID $mntDir auto defaults,acl,nofail 0 2" | sudo tee -a /etc/fstab > /dev/null
+  - echo "/dev/data-vg01/data-lv01       /export        ext4        defaults,nofail,x-systemd.requires=cloud-init.service,barrier=0,discard        0  2" >>/etc/fstab
   - mount -a
   #
   # Update /etc/exports - NOTE: The CIDR provided works for the whole VPC

Original file line number	Diff line number	Diff line change
`@@ -41,17 +41,17 @@ runcmd:`
`41`	`41`	`#`
`42`	`42`	`# Create Raid5 Array`
`43`	`43`	`#`
	`44`	`+ # NOTE: We need to sleep 5 minutes here to ensure the drives have been attached`
	`45`	`+ #`
	`46`	`+ # - sleep 300`
`44`	`47`	`- pvcreate $(find /dev/disk/azure/scsi1/ -type l \| xargs)`
`45`	`48`	`- vgcreate data-vg01 $(find /dev/disk/azure/scsi1/ -type l \| xargs)`
`46`	`49`	`- lvcreate --type raid5 --extents 100%FREE --stripes 3 --name data-lv01 data-vg01`
`47`	`50`	`- mkfs -t ext4 /dev/data-vg01/data-lv01`
`48`	`51`	`#`
`49`	`52`	`# Update /etc/fstab`
`50`	`53`	`#`
`51`		- - device=`lsblk -r \| grep lvm \| cut -d " " -f1 \| grep -v "_"`
`52`		`- - mntDir='/export'`
`53`		- - deviceUUID=`sudo blkid /dev/mapper/$device \| sed -r 's/.UUID="([^"]).*"/\1/g'`
`54`		`- - echo "UUID=$deviceUUID $mntDir auto defaults,acl,nofail 0 2" \| sudo tee -a /etc/fstab > /dev/null`
	`54`	`+ - echo "/dev/data-vg01/data-lv01 /export ext4 defaults,nofail,x-systemd.requires=cloud-init.service,barrier=0,discard 0 2" >>/etc/fstab`
`55`	`55`	`- mount -a`
`56`	`56`	`#`
`57`	`57`	`# Update /etc/exports - NOTE: The CIDR provided works for the whole VPC`