openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow operators to change hw_disk_discard in Nova"

Browse Source
This commit is contained in:
Jenkins 2016-10-19 16:50:24 +00:00 committed by Gerrit Code Review
commit 6910d25f20
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/nova/defaults/main.yml
View File

@ -13,6 +13,10 @@ nova_pool_name: "{{ ceph_nova_pool_name }}"
nova_pool_type: "{{ ceph_nova_pool_type }}" nova_pool_type: "{{ ceph_nova_pool_type }}"
nova_cache_mode: "{{ ceph_nova_cache_mode }}" 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 # Database

4
ansible/roles/nova/templates/nova.conf.j2
View File

@ -174,7 +174,9 @@ images_rbd_pool = {{ ceph_nova_pool_name }}
images_rbd_ceph_conf = /etc/ceph/ceph.conf images_rbd_ceph_conf = /etc/ceph/ceph.conf
rbd_user = nova rbd_user = nova
disk_cachemodes="network=writeback" disk_cachemodes="network=writeback"
hw_disk_discard = unmap {% if nova_hw_disk_discard != '' %}
hw_disk_discard = {{ nova_hw_disk_discard }}
{% endif %}
{% endif %} {% endif %}
{% if nova_backend == "rbd" %} {% if nova_backend == "rbd" %}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}