diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 16:50:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 16:50:24 +0000 |
| commit | 6910d25f20db2fdbf4eb684192a4be2052e88fb2 (patch) | |
| tree | e34e23a8b0f3869f6e901604ccf1eb64cc440b6c /ansible | |
| parent | 21634e4444ff1ea2dffbbe31e37cd1f5c382f91c (diff) | |
| parent | 0e0fedb05b70a6e51257ab8966499434ac79c2f9 (diff) | |
| download | kolla-6910d25f20db2fdbf4eb684192a4be2052e88fb2.tar.gz kolla-6910d25f20db2fdbf4eb684192a4be2052e88fb2.zip | |
Merge "Allow operators to change hw_disk_discard in Nova"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/defaults/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 2d80abf33..bf24c02f7 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -13,6 +13,10 @@ nova_pool_name: "{{ ceph_nova_pool_name }}" nova_pool_type: "{{ ceph_nova_pool_type }}" nova_cache_mode: "{{ ceph_nova_cache_mode }}" +# Discard option for nova managed disks. Requires libvirt (1, 0, 6) or later and +# qemu (1, 6, 0) or later. Set to "" to disable. +nova_hw_disk_discard: "unmap" + #################### # Database diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 613c8d5cd..6706d16e9 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -174,7 +174,9 @@ images_rbd_pool = {{ ceph_nova_pool_name }} images_rbd_ceph_conf = /etc/ceph/ceph.conf rbd_user = nova disk_cachemodes="network=writeback" -hw_disk_discard = unmap +{% if nova_hw_disk_discard != '' %} +hw_disk_discard = {{ nova_hw_disk_discard }} +{% endif %} {% endif %} {% if nova_backend == "rbd" %} rbd_secret_uuid = {{ rbd_secret_uuid }} |