diff --git a/manifests/engine.pp b/manifests/engine.pp
index 88bf863a..667e12fb 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -105,6 +105,10 @@
 #   (Optional) The directory to search for template files.
 #   Defaults to $::os_service_default
 #
+# [*max_nested_stack_depth*]
+#   (Optional) Maximum depth allowed when using nested stacks.
+#   Defaults to $::os_service_default
+#
 class heat::engine (
   $auth_encryption_key,
   $package_ensure                                  = 'present',
@@ -126,6 +130,7 @@ class heat::engine (
   $convergence_engine                              = $::os_service_default,
   $environment_dir                                 = $::os_service_default,
   $template_dir                                    = $::os_service_default,
+  $max_nested_stack_depth                          = $::os_service_default,
 ) {
 
   include ::heat::deps
@@ -183,5 +188,6 @@ class heat::engine (
     'DEFAULT/convergence_engine':                              value => $convergence_engine;
     'DEFAULT/environment_dir':                                 value => $environment_dir;
     'DEFAULT/template_dir':                                    value => $template_dir;
+    'DEFAULT/max_nested_stack_depth':                          value => $max_nested_stack_depth;
   }
 }
diff --git a/releasenotes/notes/max_nested_stack_depth-792ebd0ccab481eb.yaml b/releasenotes/notes/max_nested_stack_depth-792ebd0ccab481eb.yaml
new file mode 100644
index 00000000..b1a46d23
--- /dev/null
+++ b/releasenotes/notes/max_nested_stack_depth-792ebd0ccab481eb.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - Management of heat configuration is now optional for
+    heat::keystone::max_nested_stack_depth which allows
+    the maximum depth of nested stacks to be set.
diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb
index e278a99e..69833ec9 100644
--- a/spec/classes/heat_engine_spec.rb
+++ b/spec/classes/heat_engine_spec.rb
@@ -17,6 +17,7 @@ describe 'heat::engine' do
       :convergence_engine                  => '<SERVICE DEFAULT>',
       :environment_dir                     => '<SERVICE DEFAULT>',
       :template_dir                        => '<SERVICE DEFAULT>',
+      :max_nested_stack_depth              => '<SERVICE DEFAULT>',
     }
   end