Merge "Remove glance CORS overrides"

This commit is contained in:
Zuul 2018-10-09 18:43:00 +00:00 committed by Gerrit Code Review
commit bdd8b7df7b

View File

@ -24,17 +24,3 @@ glance_service_adminurl: "{{ openstack_service_adminuri_proto }}://{{ internal_l
# See https://bugs.launchpad.net/openstack-ansible/+bug/1730722 for more on the
# this topic.
glance_show_multiple_locations: "{{ (glance_default_store == 'rbd') or (horizon_image_upload_mode == 'direct') }}"
# Define the default required cors to allow image uploads through horizon
_cors_overrides:
cors:
# LP bug 1680062
allow_headers: >-
origin,content-md5,x-image-meta-checksum,x-storage-token,accept-encoding,
x-auth-token,x-identity-status,x-roles,x-service-catalog,x-user-id,
x-tenant-id,x-openstack-request-id
allowed_origin: "{{ external_lb_vip_address }}"
allow_methods: "GET,POST,PUT,PATCH,DELETE"
# Default glance API
glance_glance_api_conf_overrides: "{{ (glance_show_multiple_locations | bool) | ternary(_cors_overrides, {}) }}"