Add controller.glance_request_timeout
Change-Id: I754ca8e86cf412a4f8740aa8d7d11ebbfd0e505f
Related-prod: PROD-32756
diff --git a/cinder/files/pike/cinder.conf.controller.Debian b/cinder/files/pike/cinder.conf.controller.Debian
index 5e99f27..f582ec9 100644
--- a/cinder/files/pike/cinder.conf.controller.Debian
+++ b/cinder/files/pike/cinder.conf.controller.Debian
@@ -48,7 +48,9 @@
{%- if controller.glance.get('protocol','http') == 'https' %}
glance_ca_certificates_file = {{ controller.glance.get('cacert_file', controller.cacert_file) }}
{%- endif %}
-
+{%- if controller.glance.request_timeout is defined %}
+glance_request_timeout = {{ controller.glance.request_timeout }}
+{%- endif %}
glance_host={{ controller.glance.host }}
glance_port={{ controller.glance.port }}
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 53b02d4..3952e6f 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -345,6 +345,9 @@
# http/https timeout value for glance operations. If no value (None) is
# supplied here, the glanceclient default value is used. (integer value)
#glance_request_timeout = <None>
+{%- if controller.glance.request_timeout is defined %}
+glance_request_timeout = {{ controller.glance.request_timeout }}
+{%- endif %}
# DEPRECATED: Deploy v2 of the Cinder API. (boolean value)
# This option is deprecated for removal.