Andrew Bogott has submitted this change and it was merged.
Change subject: Scrap the /var/log lvm partition; make the / 20G by default.
......................................................................
Scrap the /var/log lvm partition; make the / 20G by default.
Bug: T87003
Change-Id: Idaeafb72aa367aea0abdcec1fb9116717e23a3e2
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
2 files changed, 3 insertions(+), 36 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 9ae88e5..1435441 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -65,41 +65,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
-
-# 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/.* //'`
hostsou=`grep 'nss_base_hosts' /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..175a854 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -19,7 +19,9 @@
type: gpt
root:
filesystem: ext4
- size: 10GiB
+ size: 19GiB
+ swap:
+ size: 512MiB
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: merged
Gerrit-Change-Id: Idaeafb72aa367aea0abdcec1fb9116717e23a3e2
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
