Merge "Move "metadata_workers" to [DEFAULT] in nova.conf"

This commit is contained in:
Zuul 2018-10-12 06:42:26 +00:00 committed by Gerrit Code Review
commit 35ba6b37ca
6 changed files with 12 additions and 6 deletions

View File

@ -128,6 +128,8 @@ pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}
default_availability_zone = {{ default_availability_zone }}
{% endif -%}
metadata_workers = {{ workers }}
{% if network_manager == 'neutron' and network_manager_config -%}
[neutron]
url = {{ network_manager_config.neutron_url }}
@ -145,7 +147,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% if glance_api_servers -%}

View File

@ -132,6 +132,8 @@ default_availability_zone = {{ default_availability_zone }}
resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
{% endif -%}
metadata_workers = {{ workers }}
{% if network_manager == 'neutron' and network_manager_config -%}
[neutron]
url = {{ network_manager_config.neutron_url }}
@ -147,7 +149,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% include "section-keystone-authtoken" %}

View File

@ -134,6 +134,8 @@ default_availability_zone = {{ default_availability_zone }}
resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
{% endif -%}
metadata_workers = {{ workers }}
{% if network_manager == 'neutron' and network_manager_config -%}
[neutron]
url = {{ network_manager_config.neutron_url }}
@ -156,7 +158,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% include "section-keystone-authtoken-mitaka" %}

View File

@ -134,6 +134,8 @@ default_availability_zone = {{ default_availability_zone }}
resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
{% endif -%}
metadata_workers = {{ workers }}
{% if network_manager == 'neutron' and network_manager_config -%}
[neutron]
url = {{ network_manager_config.neutron_url }}
@ -156,7 +158,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% include "section-keystone-authtoken-mitaka" %}

View File

@ -135,6 +135,8 @@ default_availability_zone = {{ default_availability_zone }}
resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
{% endif -%}
metadata_workers = {{ workers }}
{% if network_manager == 'neutron' and network_manager_config -%}
[neutron]
url = {{ network_manager_config.neutron_url }}
@ -157,7 +159,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% include "section-keystone-authtoken-mitaka" %}

View File

@ -130,6 +130,8 @@ default_availability_zone = {{ default_availability_zone }}
resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
{% endif -%}
metadata_workers = {{ workers }}
[pci]
{% if pci_passthrough_whitelist -%}
passthrough_whitelist = {{ pci_passthrough_whitelist }}
@ -165,7 +167,6 @@ metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_metadata_proxy=True
{% endif -%}
{% endif -%}
metadata_workers = {{ workers }}
{% endif -%}
{% include "section-keystone-authtoken-mitaka" %}