openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Fix nova.conf to reduce deprecation warnings."

Browse Source
This commit is contained in:
Jenkins 2017-02-06 14:22:37 +00:00 committed by Gerrit Code Review
commit 5a6bd9db12
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
templates/nova.conf.j2
View File

@ -15,43 +15,14 @@ rootwrap_config = /etc/nova/rootwrap.conf
service_down_time = 120 service_down_time = 120
default_schedule_zone = {{ nova_default_schedule_zone }} default_schedule_zone = {{ nova_default_schedule_zone }}
# Quota
quota_cores = {{ nova_quota_cores }}
quota_fixed_ips = {{ nova_quota_fixed_ips }}
quota_floating_ips = {{ nova_quota_floating_ips }}
quota_injected_file_content_bytes = {{ nova_quota_injected_file_content_bytes }}
quota_injected_file_path_length = {{ nova_quota_injected_file_path_length }}
quota_injected_files = {{ nova_quota_injected_files }}
quota_instances = {{ nova_quota_instances }}
quota_key_pairs = {{ nova_quota_key_pairs }}
quota_metadata_items = {{ nova_quota_metadata_items }}
quota_ram = {{ nova_quota_ram }}
quota_security_group_rules = {{ nova_quota_security_group_rules }}
quota_security_groups = {{ nova_quota_security_groups }}
quota_server_group_members = {{ nova_quota_server_group_members }}
quota_server_groups = {{ nova_quota_server_groups }}
# Scheduler # Scheduler
cpu_allocation_ratio = {{ nova_cpu_allocation_ratio }} cpu_allocation_ratio = {{ nova_cpu_allocation_ratio }}
disk_allocation_ratio = {{ nova_disk_allocation_ratio }} disk_allocation_ratio = {{ nova_disk_allocation_ratio }}
max_instances_per_host = {{ nova_max_instances_per_host }}
max_io_ops_per_host = {{ nova_max_io_ops_per_host }}
ram_allocation_ratio = {{ nova_ram_allocation_ratio }} ram_allocation_ratio = {{ nova_ram_allocation_ratio }}
ram_weight_multiplier = {{ nova_ram_weight_multiplier }}
reserved_host_disk_mb = {{ nova_reserved_host_disk_mb }} reserved_host_disk_mb = {{ nova_reserved_host_disk_mb }}
reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }} reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }}
scheduler_driver = {{ nova_scheduler_driver }}
scheduler_available_filters = {{ nova_scheduler_available_filters }}
scheduler_default_filters = {{ nova_scheduler_default_filters }}
scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }}
scheduler_host_manager = {{ nova_scheduler_host_manager }}
scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }}
scheduler_weight_classes = {{ nova_scheduler_weight_classes }}
scheduler_use_baremetal_filters = {{ nova_scheduler_use_baremetal_filters }}
scheduler_tracks_instance_changes = {{ nova_scheduler_tracks_instance_changes }}
# Compute # Compute
enable_instance_password = {{ nova_enable_instance_password }}
compute_driver = {{ nova_compute_driver }} compute_driver = {{ nova_compute_driver }}
instance_name_template = instance-%08x instance_name_template = instance-%08x
instances_path = {{ nova_system_home_folder }}/instances instances_path = {{ nova_system_home_folder }}/instances
@ -86,15 +57,11 @@ dhcp_domain = {{ nova_dhcp_domain }}
force_dhcp_release = True force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf dhcpbridge_flagfile = /etc/nova/nova.conf
firewall_driver = {{ nova_firewall_driver }} firewall_driver = {{ nova_firewall_driver }}
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %} my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
default_floating_pool = public default_floating_pool = public
use_neutron = True use_neutron = True
# Authentication
auth_strategy = keystone
## Vif ## Vif
linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }} linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }}
{% if nova_virt_type in ['kvm', 'lxd', 'qemu', 'xen'] %} {% if nova_virt_type in ['kvm', 'lxd', 'qemu', 'xen'] %}
@ -227,7 +194,7 @@ workers = {{ nova_conductor_workers | default(api_threads) }}
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }} insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ nova_keystone_auth_plugin }} auth_type = {{ nova_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ nova_service_project_domain_id }} project_domain_id = {{ nova_service_project_domain_id }}
@ -322,5 +289,40 @@ api_paste_config = /etc/nova/api-paste.ini
secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }} secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }}
{% endif %} {% endif %}
[api]
auth_strategy = keystone
enable_instance_password = {{ nova_enable_instance_password }}
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
[scheduler] [scheduler]
max_attempts = {{ nova_scheduler_max_attempts }} max_attempts = {{ nova_scheduler_max_attempts }}
scheduler_driver = {{ nova_scheduler_driver }}
periodic_task_interval = {{ nova_scheduler_driver_task_period }}
host_manager = {{ nova_scheduler_host_manager }}
[filter_scheduler]
max_instances_per_host = {{ nova_max_instances_per_host }}
max_io_ops_per_host = {{ nova_max_io_ops_per_host }}
ram_weight_multiplier = {{ nova_ram_weight_multiplier }}
available_filters = {{ nova_scheduler_available_filters }}
enabled_filters = {{ nova_scheduler_default_filters }}
host_subset_size = {{ nova_scheduler_host_subset_size }}
weight_classes = {{ nova_scheduler_weight_classes }}
use_baremetal_filters = {{ nova_scheduler_use_baremetal_filters }}
tracks_instance_changes = {{ nova_scheduler_tracks_instance_changes }}
[quota]
cores = {{ nova_quota_cores }}
fixed_ips = {{ nova_quota_fixed_ips }}
floating_ips = {{ nova_quota_floating_ips }}
injected_file_content_bytes = {{ nova_quota_injected_file_content_bytes }}
injected_file_path_length = {{ nova_quota_injected_file_path_length }}
injected_files = {{ nova_quota_injected_files }}
instances = {{ nova_quota_instances }}
key_pairs = {{ nova_quota_key_pairs }}
metadata_items = {{ nova_quota_metadata_items }}
ram = {{ nova_quota_ram }}
security_group_rules = {{ nova_quota_security_group_rules }}
security_groups = {{ nova_quota_security_groups }}
server_group_members = {{ nova_quota_server_group_members }}
server_groups = {{ nova_quota_server_groups }}