openstack
/
kolla-ansible
Code Issues Proposed changes

Move nova scheduler related parameters to [scheduler] group 

Base on nova release note[0], all general scheduler configuration
options have been added to the [scheduler] group.

[0] https://github.com/openstack/nova/blob/master/releasenotes/notes/add-scheduler-config-to-scheduler-group-c83bc770e67ac115.yaml

Change-Id: Ic15ecaced3c78b86d04572fbaf2f6be5640a2a25
Closes-Bug: #1680307
This commit is contained in:
Jeffrey Zhang 2017-04-06 11:33:59 +08:00
parent 16730ea68c
commit 63314ad6dd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,18 +22,15 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
allow_resize_to_same_host = true
{% if enable_ironic | bool %}
scheduler_host_manager = ironic_host_manager
{% endif %}
{% if service_name == "nova-compute-ironic" %}
host={{ ansible_hostname }}-ironic
log_file = /var/log/kolla/nova/nova-compute-ironic.log
compute_driver = ironic.IronicDriver
ram_allocation_ratio = 1.0
reserved_host_memory_mb = 0
{% elif enable_nova_fake | bool %}
scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter
{% endif %}
{% if enable_nova_fake | bool %}
{% if orchestration_engine == 'KUBERNETES' %}
host = empty
{% else %}
@ -233,6 +230,14 @@ secure_proxy_ssl_header = X-Forwarded-Proto
max_attempts = 10
discover_hosts_in_cells_interval = 60
{% if enable_ironic | bool %}
host_manager = ironic_host_manager
{% endif %}
{% if enable_nova_fake | bool %}
default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter
{% endif %}
[placement]
auth_type = password
{% if orchestration_engine == 'KUBERNETES' %}