diff --git a/manifests/engine.pp b/manifests/engine.pp
index 244c2c6a..67e8cd7e 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -78,7 +78,7 @@
 #   associated SoftwareDeployment resources.
 #   Allowed values: HEAT_CFNTOOLS, RAW, SOFTWARE_CONFIG
 #   Defaults to $::os_service_default.
-
+#
 # [*trusts_delegated_roles*]
 #   (optional) Array of trustor roles to be delegated to heat.
 #   This value is also used by heat::keystone::auth if it is set to
@@ -125,12 +125,17 @@
 #   (Optional) List of directories to search for plug-ins.
 #   Defaults to $::os_service_default
 #
+# [*server_keystone_endpoint_type*]
+#   (Optional) If set, is used to control which authentication endpoint is used
+#   by user-controlled servers to make calls back to Heat.
+#   Defaults to $::os_service_default
+#
 # DEPRECATED PARAMETERS
 #
 # [*heat_watch_server_url*]
 #   (optional) URL of the Heat cloudwatch server
 #   Defaults to undef.
-
+#
 class heat::engine (
   $auth_encryption_key,
   $package_ensure                                  = 'present',
@@ -155,6 +160,7 @@ class heat::engine (
   $template_dir                                    = $::os_service_default,
   $max_nested_stack_depth                          = $::os_service_default,
   $plugin_dirs                                     = $::os_service_default,
+  $server_keystone_endpoint_type                   = $::os_service_default,
   # DEPRECATED PARAMETERS
   $heat_watch_server_url                           = undef,
 ) {
@@ -233,5 +239,6 @@ class heat::engine (
     'DEFAULT/template_dir':                                    value => $template_dir;
     'DEFAULT/max_nested_stack_depth':                          value => $max_nested_stack_depth;
     'DEFAULT/plugin_dirs':                                     value => $plugin_dirs_real;
+    'DEFAULT/server_keystone_endpoint_type':                   value => $server_keystone_endpoint_type;
   }
 }
diff --git a/releasenotes/notes/server_keystone_endpoint_type-82c3f461916653d8.yaml b/releasenotes/notes/server_keystone_endpoint_type-82c3f461916653d8.yaml
new file mode 100644
index 00000000..d55dc921
--- /dev/null
+++ b/releasenotes/notes/server_keystone_endpoint_type-82c3f461916653d8.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added server_keystone_endpoint_type parameter to heat::engine.
diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb
index f4210863..5201a379 100644
--- a/spec/classes/heat_engine_spec.rb
+++ b/spec/classes/heat_engine_spec.rb
@@ -20,6 +20,7 @@ describe 'heat::engine' do
       :template_dir                        => '<SERVICE DEFAULT>',
       :max_nested_stack_depth              => '<SERVICE DEFAULT>',
       :plugin_dirs                         => '<SERVICE DEFAULT>',
+      :server_keystone_endpoint_type       => '<SERVICE DEFAULT>',
     }
   end
 
@@ -49,6 +50,7 @@ describe 'heat::engine' do
         :reauthentication_auth_method        => 'trusts',
         :environment_dir                     => '/etc/heat/environment.d',
         :template_dir                        => '/etc/heat/templates',
+        :server_keystone_endpoint_type       => 'public',
       }
     ].each do |new_params|
       describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@@ -95,6 +97,7 @@ describe 'heat::engine' do
       it { is_expected.to contain_heat_config('DEFAULT/environment_dir').with_value( expected_params[:environment_dir] ) }
       it { is_expected.to contain_heat_config('DEFAULT/template_dir').with_value( expected_params[:template_dir] ) }
       it { is_expected.to contain_heat_config('DEFAULT/plugin_dirs').with_value('<SERVICE DEFAULT>') }
+      it { is_expected.to contain_heat_config('DEFAULT/server_keystone_endpoint_type').with_value( expected_params[:server_keystone_endpoint_type] ) }
     end
 
     context 'with disabled service managing' do