diff options
| author | Lénaïc Huard <lhuard@amadeus.com> | 2016-07-13 15:57:59 +0200 |
|---|---|---|
| committer | Lénaïc Huard <lhuard@amadeus.com> | 2016-07-13 15:57:59 +0200 |
| commit | 0618bbbe596d4459f5a80be7a06a41186432a4ad (patch) | |
| tree | c4383f773d5cd74f4b3d7f9d19f806aa474b6c25 /playbooks/libvirt/openshift-cluster/templates/user-data | |
| parent | 21fcfdbbafc138ccc8e648b4134f9352df38da51 (diff) | |
| download | openshift-0618bbbe596d4459f5a80be7a06a41186432a4ad.tar.gz openshift-0618bbbe596d4459f5a80be7a06a41186432a4ad.tar.bz2 openshift-0618bbbe596d4459f5a80be7a06a41186432a4ad.tar.xz openshift-0618bbbe596d4459f5a80be7a06a41186432a4ad.zip | |
Make libvirt’s VM use virtio-scsi insteal of virtio-blk
The main advantage is that virtio-scsi honors TRIM so that deleting files
and/or docker images inside the VM now frees disk space on the host by
resparsifying the qcow2 file.
Diffstat (limited to 'playbooks/libvirt/openshift-cluster/templates/user-data')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/templates/user-data | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/playbooks/libvirt/openshift-cluster/templates/user-data b/playbooks/libvirt/openshift-cluster/templates/user-data index 8b79940f4..fbcf7c886 100644 --- a/playbooks/libvirt/openshift-cluster/templates/user-data +++ b/playbooks/libvirt/openshift-cluster/templates/user-data @@ -5,7 +5,7 @@ hostname: {{ item[0] }} fqdn: {{ item[0] }}.example.com mounts: -- [ vdb ] +- [ sdb ] users: - default @@ -26,12 +26,18 @@ write_files: permissions: 440 content: | Defaults:openshift !requiretty - - content: | - DEVS=/dev/vdb - VG=docker_vg - path: /etc/sysconfig/docker-storage-setup + - path: /etc/sysconfig/docker-storage-setup owner: root:root permissions: '0644' + content: | + DEVS=/dev/sdb + VG=docker_vg + EXTRA_DOCKER_STORAGE_OPTIONS='--storage-opt dm.blkdiscard=true' + - path: /etc/systemd/system/fstrim.timer.d/hourly.conf + content: | + [Timer] + OnCalendar=hourly runcmd: - NETWORK_CONFIG=/etc/sysconfig/network-scripts/ifcfg-eth0; if ! grep DHCP_HOSTNAME ${NETWORK_CONFIG}; then echo 'DHCP_HOSTNAME="{{ item[0] }}.example.com"' >> ${NETWORK_CONFIG}; fi; pkill -9 dhclient; service network restart + - systemctl enable --now fstrim.timer |