Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186113
Change subject: Scrap the /var/log lvm partition; make the / 20G by default.
......................................................................
Scrap the /var/log lvm partition; make the / 20G by default.
Change-Id: Idaeafb72aa367aea0abdcec1fb9116717e23a3e2
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
2 files changed, 1 insertion(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/186113/1
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 9ae88e5..e30f25d 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -75,30 +75,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/log\s' /etc/fstab
-then
- echo 'Creating /var/log volume'
- /sbin/lvcreate -L 2G -n log vd
- /sbin/mkfs -t ext4 /dev/mapper/vd-log
- /bin/mkdir -p /tmp/log
- /bin/mount /dev/mapper/vd-log /tmp/log
- /bin/tar cf - -C /var log | /bin/tar xf - -C /tmp
- /bin/umount /tmp/log
- 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
binddn=`grep 'binddn' /etc/ldap.conf | sed 's/.* //'`
bindpw=`grep 'bindpw' /etc/ldap.conf | sed 's/.* //'`
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 40c44a6..2a22d10 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -19,7 +19,7 @@
type: gpt
root:
filesystem: ext4
- size: 10GiB
+ size: 20GiB
packages:
mirror: http://mirrors.wikimedia.org/debian
install_standard: true
--
To view, visit https://gerrit.wikimedia.org/r/186113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaeafb72aa367aea0abdcec1fb9116717e23a3e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
