Remove glance CORS overrides
With https://review.openstack.org/579224 merged, these overrides
are no longer needed as they are set in the role instead.
Change-Id: I1c4e36c26afa61990ec24d42f66273164ba7612c
(cherry picked from commit 8440e3816d
)
This commit is contained in:
parent
d100e4484c
commit
215fd62043
|
@ -81,7 +81,7 @@
|
|||
- name: os_glance
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
|
||||
version: 85e10fe406e818043c403a1cbab9eec2d7110dbc
|
||||
version: 021c508d1f415260fb86eea694f35db5c82e0d4f
|
||||
- name: os_gnocchi
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
|
||||
|
|
|
@ -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, {}) }}"
|
||||
|
|
Loading…
Reference in New Issue