diff --git a/deployment/puppet/openstack_tasks/manifests/heat/heat.pp b/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
index 7b769dc4fc..3ed0d0baa4 100644
--- a/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
+++ b/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
@@ -214,7 +214,8 @@ class openstack_tasks::heat::heat {
     database_max_retries               => $max_retries,
 
     kombu_compression                  => $kombu_compression,
-    memcached_servers                  => $memcached_servers
+    memcached_servers                  => $memcached_servers,
+    enable_proxy_headers_parsing       => true,
   }
 
   # Engine
diff --git a/tests/noop/spec/hosts/heat/heat_spec.rb b/tests/noop/spec/hosts/heat/heat_spec.rb
index 180499777e..cc67d82dd9 100644
--- a/tests/noop/spec/hosts/heat/heat_spec.rb
+++ b/tests/noop/spec/hosts/heat/heat_spec.rb
@@ -140,6 +140,12 @@ describe manifest do
       )
     end
 
+    it 'should configure heat class' do
+      should contain_class('heat').with(
+        'enable_proxy_headers_parsing' => true,
+      )
+    end
+
     it 'should configure memcache for keystone authtoken' do
         should contain_heat_config('keystone_authtoken/memcached_servers').with_value(memcached_servers.join(','))
     end