Merge "Managing show_image_direct_url variable"
diff --git a/glance/files/juno/glance-api.conf.Debian b/glance/files/juno/glance-api.conf.Debian
index e031a00..f8e6c2c 100644
--- a/glance/files/juno/glance-api.conf.Debian
+++ b/glance/files/juno/glance-api.conf.Debian
@@ -98,7 +98,7 @@
# be returned to the user in the 'direct_url' meta-data field.
# The default value is false.
#show_image_direct_url = False
-show_image_direct_url = True
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# Send headers containing user and tenant information when making requests to
# the v1 glance registry. This allows the registry to function as if a user is
diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index c854402..e4f76d1 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -70,7 +70,7 @@
# be returned to the user in the 'direct_url' meta-data field.
# The default value is false.
#show_image_direct_url = False
-show_image_direct_url = True
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# Send headers containing user and tenant information when making requests to
# the v1 glance registry. This allows the registry to function as if a user is
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index 3485a7f..e29bce7 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -74,7 +74,7 @@
# be returned to the user in the 'direct_url' meta-data field.
# The default value is false.
#show_image_direct_url = False
-show_image_direct_url = True
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# Send headers containing user and tenant information when making requests to
# the v1 glance registry. This allows the registry to function as if a user is
diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
index 06e7183..b57b330 100644
--- a/glance/files/mitaka/glance-api.conf.Debian
+++ b/glance/files/mitaka/glance-api.conf.Debian
@@ -64,7 +64,7 @@
# properties. Revealing storage location can be a security risk, so
# use this setting with caution! (boolean value)
#show_image_direct_url = false
-show_image_direct_url = true
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# Whether to include the backend image locations in image properties.
# For example, if using the file system store a URL of
diff --git a/glance/files/newton/glance-api.conf.Debian b/glance/files/newton/glance-api.conf.Debian
index 34e29ec..dfa014e 100644
--- a/glance/files/newton/glance-api.conf.Debian
+++ b/glance/files/newton/glance-api.conf.Debian
@@ -294,7 +294,7 @@
#
# (boolean value)
#show_image_direct_url = false
-show_image_direct_url = true
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# DEPRECATED:
# Show all image locations when returning an image.
diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
index 28bd4dc..48501e2 100644
--- a/glance/files/ocata/glance-api.conf.Debian
+++ b/glance/files/ocata/glance-api.conf.Debian
@@ -294,7 +294,7 @@
#
# (boolean value)
#show_image_direct_url = false
-show_image_direct_url = true
+show_image_direct_url = {{ server.get('show_image_direct_url', True)|lower }}
# DEPRECATED:
# Show all image locations when returning an image.