Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/186121
Change subject: labs_vmbuilder: Remove separate /var and /var/log ...................................................................... labs_vmbuilder: Remove separate /var and /var/log Mirror Idaeafb72aa367aea0abdcec1fb9116717e23a3e2 for ubuntu Bug: T87003 Change-Id: If4b3d62bc1fde9a781e4cbc6169fcc991dcc9f13 --- M modules/labs_vmbuilder/files/firstboot.sh M modules/labs_vmbuilder/files/vmbuilder.partition 2 files changed, 1 insertion(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/186121/1 diff --git a/modules/labs_vmbuilder/files/firstboot.sh b/modules/labs_vmbuilder/files/firstboot.sh index 95290eb..17cc089 100644 --- a/modules/labs_vmbuilder/files/firstboot.sh +++ b/modules/labs_vmbuilder/files/firstboot.sh @@ -50,37 +50,6 @@ /sbin/swapon -a fi -# If we don't have a /var, we create it and /var/log, -# move everything to it, and forcibly reboot now to try -# everything anew -if ! /bin/egrep -q '^\S+\s+/var\s' /etc/fstab -then - echo 'Creating /var and /var/log volumes' - /sbin/lvcreate -L 2G -n var vd - /sbin/mkfs -t ext4 /dev/mapper/vd-var - /sbin/lvcreate -L 2G -n log vd - /sbin/mkfs -t ext4 /dev/mapper/vd-log - /bin/mkdir -p /tmp/var - /bin/mount /dev/mapper/vd-var /tmp/var - /bin/mkdir -p /tmp/var/log - /bin/mount /dev/mapper/vd-log /tmp/var/log - /bin/tar cf - -C / var | /bin/tar xf - -C /tmp - /bin/umount /tmp/var/log - /bin/umount /tmp/var - echo "/dev/mapper/vd-var /var ext4 defaults 0 0" >>/etc/fstab - echo "/dev/mapper/vd-log /var/log ext4 defaults 0 0" >>/etc/fstab - - # We're all done. Now all that's left is to reboot making sure - # that this script executes again. This is done by remounting - # / readonly before a forcible reboot - this way the file - # used to tell rc.local to not execute firstboot.sh again can't - # be created. - - /bin/sync - /bin/mount -oro,remount / - /sbin/reboot -f -fi - puppet agent --enable binddn=`grep 'binddn' /etc/ldap.conf | sed 's/.* //'` diff --git a/modules/labs_vmbuilder/files/vmbuilder.partition b/modules/labs_vmbuilder/files/vmbuilder.partition index ea74daf..26a25fc 100644 --- a/modules/labs_vmbuilder/files/vmbuilder.partition +++ b/modules/labs_vmbuilder/files/vmbuilder.partition @@ -1,2 +1,2 @@ -root 10240 +root 20480 swap 2048 -- To view, visit https://gerrit.wikimedia.org/r/186121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4b3d62bc1fde9a781e4cbc6169fcc991dcc9f13 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
