Merge "Fix use of deprecated image_cache_manager_interval"
This commit is contained in:
commit
43b1b62f22
@ -18,7 +18,6 @@ reserved_host_memory_mb = {{ nova_reserved_host_memory_mb }}
|
|||||||
compute_driver = {{ nova_compute_driver }}
|
compute_driver = {{ nova_compute_driver }}
|
||||||
instances_path = {{ nova_system_home_folder }}/instances
|
instances_path = {{ nova_system_home_folder }}/instances
|
||||||
allow_resize_to_same_host = True
|
allow_resize_to_same_host = True
|
||||||
image_cache_manager_interval = {{ nova_image_cache_manager_interval }}
|
|
||||||
|
|
||||||
{% if ansible_os_family | lower == 'suse' %}
|
{% if ansible_os_family | lower == 'suse' %}
|
||||||
mkisofs_cmd = /usr/bin/mkisofs
|
mkisofs_cmd = /usr/bin/mkisofs
|
||||||
@ -63,6 +62,10 @@ driver = {{ (notification_topics | length > 0) | ternary('messagingv2', 'noop')
|
|||||||
transport_url = {{ nova_oslomsg_notify_transport }}://{% for host in nova_oslomsg_notify_servers.split(',') %}{{ nova_oslomsg_notify_userid }}:{{ nova_oslomsg_notify_password }}@{{ host }}:{{ nova_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ nova_oslomsg_notify_vhost }}{% if nova_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
|
transport_url = {{ nova_oslomsg_notify_transport }}://{% for host in nova_oslomsg_notify_servers.split(',') %}{{ nova_oslomsg_notify_userid }}:{{ nova_oslomsg_notify_password }}@{{ host }}:{{ nova_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ nova_oslomsg_notify_vhost }}{% if nova_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
|
||||||
|
|
||||||
|
|
||||||
|
# Image cache
|
||||||
|
[image_cache]
|
||||||
|
manager_interval = {{ nova_image_cache_manager_interval }}
|
||||||
|
|
||||||
# Cache
|
# Cache
|
||||||
[cache]
|
[cache]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user