openstack/kolla-ansible
Code Issues Proposed changes

Merge "Move nova scheduler related parameters to [scheduler] group"

Browse Source
This commit is contained in:
Jenkins 2017-07-18 01:43:38 +00:00 committed by Gerrit Code Review
commit a17315e39b
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 allow_resize_to_same_host = true
{% if enable_ironic | bool %}
scheduler_host_manager = ironic_host_manager
{% endif %}
{% if service_name == "nova-compute-ironic" %} {% if service_name == "nova-compute-ironic" %}
host={{ ansible_hostname }}-ironic host={{ ansible_hostname }}-ironic
log_file = /var/log/kolla/nova/nova-compute-ironic.log log_file = /var/log/kolla/nova/nova-compute-ironic.log
compute_driver = ironic.IronicDriver compute_driver = ironic.IronicDriver
ram_allocation_ratio = 1.0 ram_allocation_ratio = 1.0
reserved_host_memory_mb = 0 reserved_host_memory_mb = 0
{% elif enable_nova_fake | bool %} {% endif %}
scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter
{% if enable_nova_fake | bool %}
{% if orchestration_engine == 'KUBERNETES' %} {% if orchestration_engine == 'KUBERNETES' %}
host = empty host = empty
{% else %} {% else %}
@ -233,6 +230,14 @@ secure_proxy_ssl_header = X-Forwarded-Proto
max_attempts = 10 max_attempts = 10
discover_hosts_in_cells_interval = 60 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] [placement]
auth_type = password auth_type = password
{% if orchestration_engine == 'KUBERNETES' %} {% if orchestration_engine == 'KUBERNETES' %}