Merge "Configure cors for glance for additional usability"

This commit is contained in:
Zuul 2018-05-09 13:29:42 +00:00 committed by Gerrit Code Review
commit 8a6b06382e
2 changed files with 35 additions and 0 deletions

View File

@ -28,3 +28,22 @@ glance_service_internalurl: "{{ glance_service_internaluri }}"
glance_service_adminuri: "{{ glance_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
glance_service_adminurl: "{{ glance_service_adminuri }}"
glance_api_servers: "{{ glance_service_internaluri }}"
# When running RBD or horizon image upload mode is direct allow multiple locations.
# 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, {}) }}"

View File

@ -0,0 +1,16 @@
---
# Copyright 2017, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
horizon_image_upload_mode: direct