From 92c06de6aac5be1f4d5481005d0ccf206e374a98 Mon Sep 17 00:00:00 2001 From: Shane Peters Date: Thu, 22 Dec 2016 14:52:07 -0500 Subject: [PATCH] Set 'show_image_direct_url' in openstack >= kilo To expose the image location in the API for versions below Mitaka, show_image_direct_url should be set to True. For Mitaka specifically, show_multiple_locations should also be set. This change sets both of these values when show_multiple_locations is set in the charm. Change-Id: Ibb3b6ecd92834f6345d21801942da0d3466d5bdc Closes-Bug: #1645703 --- templates/kilo/glance-api.conf | 1 + templates/mitaka/glance-api.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/kilo/glance-api.conf b/templates/kilo/glance-api.conf index 4378ecc3..2bd56bee 100644 --- a/templates/kilo/glance-api.conf +++ b/templates/kilo/glance-api.conf @@ -26,6 +26,7 @@ registry_client_protocol = http {% if expose_image_locations -%} show_multiple_locations = {{ expose_image_locations }} +show_image_direct_url = {{ expose_image_locations }} {% endif -%} {% if api_config_flags -%} diff --git a/templates/mitaka/glance-api.conf b/templates/mitaka/glance-api.conf index df146f04..0b5a56cd 100644 --- a/templates/mitaka/glance-api.conf +++ b/templates/mitaka/glance-api.conf @@ -26,6 +26,7 @@ registry_client_protocol = http {% if expose_image_locations -%} show_multiple_locations = {{ expose_image_locations }} +show_image_direct_url = {{ expose_image_locations }} {% endif -%} {% if api_config_flags -%}