diff --git a/defaults/main.yml b/defaults/main.yml
index ca3d1d4b..7b21a7fd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -122,6 +122,10 @@ 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 }}"
 
+## Enable automatic parsing of X-Forwarded-Proto, etc. headers passed by the
+## load balancer.
+glance_proxy_headers_parsing: True
+
 ## Swift Options
 glance_swift_store_auth_address: "{{ keystone_service_internalurl }}"
 glance_swift_store_auth_insecure: "{{ keystone_service_internaluri_insecure }}"
diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2
index 5b9844d6..582541d6 100644
--- a/templates/glance-api.conf.j2
+++ b/templates/glance-api.conf.j2
@@ -110,3 +110,8 @@ rbd_store_chunk_size = {{ glance_rbd_store_chunk_size }}
 
 [profiler]
 enabled = {{ glance_profiler_enabled }}
+
+{% if glance_proxy_headers_parsing | bool %}
+[oslo_middleware]
+enable_proxy_headers_parsing = True
+{% endif %}