From ecfedcb0b89095f329f4445b0e032f06a7703df2 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 10 Aug 2019 15:48:38 -0400 Subject: [PATCH] config: cleanup configuration file [DEFAULT]/use_stderr: matching default[1] [DEFAULT]/rootwrap_config: matching default[2] [DEFAULT]/instance_name_template: matching default[3] [DEFAULT]/libvirt_vif_type: zero reference in nova code [libvirt]/use_virtio_for_bridges: matching default[4] [api]/auth_strategy: matching default[5] [1]: https://docs.openstack.org/nova/latest/configuration/config.html#DEFAULT.use_stderr [2]: https://docs.openstack.org/nova/latest/configuration/config.html#DEFAULT.rootwrap_config [3]: https://docs.openstack.org/nova/latest/configuration/config.html#DEFAULT.instance_name_template [4]: https://docs.openstack.org/nova/latest/configuration/config.html#libvirt.use_virtio_for_bridges [5]: https://docs.openstack.org/nova/latest/configuration/config.html#api.auth_strategy Change-Id: I5bffb58cba2caafc020c726e9741878361c96497 --- templates/nova.conf.j2 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 1c9721f2..86d443e3 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -1,14 +1,11 @@ # {{ ansible_managed }} [DEFAULT] -# Disable stderr logging -use_stderr = False # Logs / State debug = {{ debug }} fatal_deprecations = {{ nova_fatal_deprecations }} use_journal = True state_path = {{ nova_system_home_folder }} -rootwrap_config = /etc/nova/rootwrap.conf service_down_time = 120 {% if nova_default_schedule_zone is defined %} default_schedule_zone = {{ nova_default_schedule_zone }} @@ -23,7 +20,6 @@ reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }} # Compute compute_driver = {{ nova_compute_driver }} -instance_name_template = instance-%08x instances_path = {{ nova_system_home_folder }}/instances allow_resize_to_same_host = True image_cache_manager_interval = {{ nova_image_cache_manager_interval }} @@ -52,11 +48,6 @@ metadata_workers = {{ nova_metadata_workers | default(nova_api_threads) }} # Network my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %} -## Vif -{% if nova_virt_type in ['kvm', 'qemu', 'xen'] %} -libvirt_vif_type = ethernet -{% endif %} - # Hypervisor default_ephemeral_format = ext4 @@ -237,7 +228,6 @@ insecure = {{ keystone_service_adminuri_insecure | bool }} inject_partition = {{ nova_libvirt_inject_partition }} inject_password = {{ nova_libvirt_inject_password }} inject_key = {{ nova_libvirt_inject_key }} -use_virtio_for_bridges = True virt_type = {{ nova_virt_type }} remove_unused_resized_minimum_age_seconds = {{ nova_remove_unused_resized_minimum_age_seconds }} {% if nova_cpu_mode is defined %} @@ -289,7 +279,6 @@ secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }} {% 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 }} vendordata_jsonfile_path = /etc/nova/vendor_data.json