diff --git a/manifests/init.pp b/manifests/init.pp
index 045d14ae..19d0f148 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -277,6 +277,11 @@
 #     take for evaluation.
 #   Defaults to $::os_service_default.
 #
+# [*max_stacks_per_tenant*]
+#   (optional) Maximum number of stacks any one tenant may have active at one
+#     time.
+#   Defaults to $::os_service_default.
+#
 # DEPRECATED PARAMETERS
 #
 # [*database_min_pool_size*]
@@ -343,6 +348,7 @@ class heat(
   $auth_strategy                      = 'keystone',
   $yaql_memory_quota                  = $::os_service_default,
   $yaql_limit_iterators               = $::os_service_default,
+  $max_stacks_per_tenant              = $::os_service_default,
   # DEPRECATED PARAMETERS
   $database_min_pool_size             = undef,
 ) {
@@ -433,6 +439,7 @@ class heat(
     'DEFAULT/region_name_for_services':     value => $region_name;
     'DEFAULT/enable_stack_abandon':         value => $enable_stack_abandon;
     'DEFAULT/enable_stack_adopt':           value => $enable_stack_adopt;
+    'DEFAULT/max_stacks_per_tenant':        value => $max_stacks_per_tenant;
     'ec2authtoken/auth_uri':                value => $keystone_ec2_uri;
     'paste_deploy/flavor':                  value => $flavor;
     'yaql/limit_iterators':                 value => $yaql_limit_iterators;
diff --git a/releasenotes/notes/max_stacks_per_tenant-f87122cc1f6db72b.yaml b/releasenotes/notes/max_stacks_per_tenant-f87122cc1f6db72b.yaml
new file mode 100644
index 00000000..7cbac65b
--- /dev/null
+++ b/releasenotes/notes/max_stacks_per_tenant-f87122cc1f6db72b.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    It is now possible to configure the max_stacks_per_tenant of heat, which
+    by default, is set to 100 in heat. Since 100 stacks per tenant can be a
+    way too small in some setups, it is convenient to be able to configure
+    this value with puppet.
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index 2378fdb0..ad825bc9 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -89,6 +89,10 @@ describe 'heat' do
       is_expected.to contain_heat_config('DEFAULT/max_template_size').with_value('<SERVICE DEFAULT>')
     end
 
+    it 'configures max_stacks_per_tenant' do
+      is_expected.to contain_heat_config('DEFAULT/max_stacks_per_tenant').with_value('<SERVICE DEFAULT>')
+    end
+
     it 'configures max_json_body_size' do
       is_expected.to contain_heat_config('DEFAULT/max_json_body_size').with_value('<SERVICE DEFAULT>')
     end