diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
commit | 03f31fdc581eea090388b5a60b3818167eb47c0c (patch) | |
tree | 75a29846b763d24bf52c98f786ce1b6189c3a626 /playbooks/libvirt/openshift-cluster/templates/user-data | |
parent | 3073846a8c9e02af06d4d56f0141766b2337424b (diff) | |
parent | faf5618ec483baa7618f02de91128e8f1eaaa471 (diff) | |
download | openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.gz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.bz2 openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.xz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.zip |
Merge remote-tracking branch 'upstream/master' into upgrade33
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 |