summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmarlok <tmarlok@gmail.com>2018-10-31 12:54:20 +0100
committertmarlok <tmarlok@gmail.com>2018-11-18 16:50:26 +0100
commit693a6f57a83475b7c260b023ba0d5947c80cb8db (patch)
treee1da62fbcedea7d9fba59306a1b437e67bb85a44
parentd28c0dced7adbb8b1d2a2f01ca9163350b358591 (diff)
Adds protocol to glance_cors_allowed_origin var
When the horizon runs on https, then the IP is not enough in the allowed_origins, the protocoll must be included as well. Change-Id: Icd806d98b74671278ea17837107ee9bb14f1b303 Closes-Bug: #1799910
Notes
Notes (review): Code-Review+1: Damian Cikowski (dcdamien) <damian@geo-com.pl> Code-Review+2: Mohammed Naser <mnaser@vexxhost.com> Code-Review+2: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Workflow+1: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 01 Dec 2018 09:58:47 +0000 Reviewed-on: https://review.openstack.org/614490 Project: openstack/openstack-ansible-os_glance Branch: refs/heads/master
-rw-r--r--defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 8875cb8..993edaa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -192,7 +192,7 @@ glance_keystone_auth_plugin: password
192glance_image_cache_max_size: 10737418240 192glance_image_cache_max_size: 10737418240
193 193
194# CORS options 194# CORS options
195glance_cors_allowed_origin: "{{ (glance_show_multiple_locations | bool) | ternary(external_lb_vip_address, None) }}" 195glance_cors_allowed_origin: "{{ (glance_show_multiple_locations | bool) | ternary(openstack_service_publicuri_proto | default('http') + '://' + external_lb_vip_address, None) }}"
196# If ``glance_api_workers`` is unset the system will use half the number of available VCPUS to 196# If ``glance_api_workers`` is unset the system will use half the number of available VCPUS to
197# compute the number of api workers to use. 197# compute the number of api workers to use.
198# glance_api_workers: 16 198# glance_api_workers: 16