Merge "Set default qemu settings for RBD"

openstack/openstack-ansible-os_nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2021年04月13日 11:08:19 +00:00

committed by Gerrit Code Review

parent 0870a01a6a 4cc6ed4b48

commit f7858e9440

4 changed files with 14 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml

View File

@@ -491,7 +491,7 @@ nova_qemu_group: kvm

# Define the following variable to drop a replacement

# file for /etc/libvirt/qemu.conf

#qemu_conf_dict: {}

qemu_conf_dict:{}

## Tunable overrides

nova_nova_conf_overrides:{}

2
tasks/drivers/kvm/nova_compute_kvm.yml

View File

@@ -104,7 +104,7 @@

group:"root"

mode:"0600"

when:

- qemu_conf_dict is defined

- _nova_qemu_conf | length > 0

or nova_network_type == 'calico'

notify:Restart libvirt-bin

tags:

5
templates/qemu.conf.j2

View File

@@ -15,8 +15,7 @@ cgroup_device_acl = [

]

{% endif %}

{% if qemu_conf_dict is defined %}

{% for key, value in qemu_conf_dict.items() %}

{% for key, value in _nova_qemu_conf.items() %}

{{ key }} = {{ value }}

{% endfor %}

{% endif %}

10
vars/main.yml

View File

@@ -104,3 +104,13 @@ _nova_scheduler_filters: |-

{% set filters = default_filters %}

{% endif %}

{{ filters + nova_scheduler_extra_filters }}

_qemu_default_conf_dict:|-

{% set qemu_dict = {} %}

{% if nova_rbd_inuse or nova_cinder_rbd_inuse %}

{% set _ = qemu_dict.update({'max_files': '32768'}) %}

{% set _ = qemu_dict.update({'max_processes': '131072'}) %}

{% endif %}

{{ qemu_dict }}

_nova_qemu_conf:"{{ _qemu_default_conf_dict | combine(qemu_conf_dict) }}"