Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/186125
Change subject: labs_vmbuilder: Don't setup lvm based swap ...................................................................... labs_vmbuilder: Don't setup lvm based swap It was defined twice, no idea why Change-Id: I3feb6b5d4e14ee99766762b8ca29937085b5414e --- M modules/labs_vmbuilder/files/firstboot.sh 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/186125/1 diff --git a/modules/labs_vmbuilder/files/firstboot.sh b/modules/labs_vmbuilder/files/firstboot.sh index 17cc089..b5cb3fd 100644 --- a/modules/labs_vmbuilder/files/firstboot.sh +++ b/modules/labs_vmbuilder/files/firstboot.sh @@ -40,16 +40,6 @@ fi # At this point, all (the rest of) our disk are belong to LVM. -# If we don't have a swap partition, make one now -if ! /bin/egrep -q '^\S+\s+\S+\s+swap\s' /etc/fstab -then - echo 'Creating swap volume' - /sbin/lvcreate -L 2G -n swap vd - /sbin/mkswap /dev/mapper/vd-swap - echo "/dev/mapper/vd-swap none swap defaults 0 0" >>/etc/fstab - /sbin/swapon -a -fi - puppet agent --enable binddn=`grep 'binddn' /etc/ldap.conf | sed 's/.* //'` -- To view, visit https://gerrit.wikimedia.org/r/186125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3feb6b5d4e14ee99766762b8ca29937085b5414e 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
