Merge "Omit default_schedule_zone if its not configured"

This commit is contained in:
Zuul 2018-03-10 17:14:21 +00:00 committed by Gerrit Code Review
commit 159eac4213
2 changed files with 3 additions and 1 deletions

View File

@ -306,7 +306,7 @@ nova_max_age: 0
nova_remove_unused_resized_minimum_age_seconds: 3600
nova_image_cache_manager_interval: 0
nova_resume_guests_state_on_host_boot: False
nova_default_schedule_zone: nova
# nova_default_schedule_zone: nova
# Comma separated list of Glance API servers
# nova_glance_api_servers:

View File

@ -10,7 +10,9 @@ log_dir = {{ nova_log_dir }}
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 }}
{% endif %}
# Scheduler
cpu_allocation_ratio = {{ nova_cpu_allocation_ratio }}