Merge "Fix Ceph backed Nova snapshot"

This commit is contained in:
Jenkins 2017-01-10 10:07:55 +00:00 committed by Gerrit Code Review
commit af4848fd98
2 changed files with 2 additions and 0 deletions

View File

@ -60,6 +60,7 @@ glance_additional_stores:
- cinder - cinder
glance_flavor: "{% if glance_default_store == 'rbd' %}keystone{% else %}keystone+cachemanagement{% endif %}" glance_flavor: "{% if glance_default_store == 'rbd' %}keystone{% else %}keystone+cachemanagement{% endif %}"
glance_show_image_direct_url: "{{ glance_default_store == 'rbd' }}" glance_show_image_direct_url: "{{ glance_default_store == 'rbd' }}"
glance_show_multiple_locations: "{{ glance_default_store == 'rbd' }}"
## API options ## API options

View File

@ -34,6 +34,7 @@ image_cache_dir = {{ glance_system_user_home }}/cache/
# defaults to true if RBD is used as default store # defaults to true if RBD is used as default store
show_image_direct_url = {{ glance_show_image_direct_url }} show_image_direct_url = {{ glance_show_image_direct_url }}
show_multiple_locations = {{ glance_show_multiple_locations }}
[task] [task]
task_executor = {{ glance_task_executor }} task_executor = {{ glance_task_executor }}