diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 360989b5..373a26e3 100644
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -29,14 +29,20 @@
 #  [*auth_cacert*]
 #    Certificate chain for SSL validation. Optional; Defaults to 'None'
 #
+#  [*auth_endpoint_type*]
+#    Type of endpoint in Identity service catalog to use for
+#    communication with OpenStack services.
+#    Optional. Defaults to undef.
+#
 class ceilometer::agent::auth (
   $auth_password,
-  $auth_url         = 'http://localhost:5000/v2.0',
-  $auth_region      = 'RegionOne',
-  $auth_user        = 'ceilometer',
-  $auth_tenant_name = 'services',
-  $auth_tenant_id   = undef,
-  $auth_cacert      = undef,
+  $auth_url           = 'http://localhost:5000/v2.0',
+  $auth_region        = 'RegionOne',
+  $auth_user          = 'ceilometer',
+  $auth_tenant_name   = 'services',
+  $auth_tenant_id     = undef,
+  $auth_cacert        = undef,
+  $auth_endpoint_type = undef,
 ) {
 
   if ! $auth_cacert {
@@ -59,4 +65,10 @@
     }
   }
 
+  if $auth_endpoint_type {
+    ceilometer_config {
+      'service_credentials/os_endpoint_type' : value => $auth_endpoint_type;
+    }
+  }
+
 }
diff --git a/spec/classes/ceilometer_agent_auth_spec.rb b/spec/classes/ceilometer_agent_auth_spec.rb
index 14b1904d..7e7c1723 100644
--- a/spec/classes/ceilometer_agent_auth_spec.rb
+++ b/spec/classes/ceilometer_agent_auth_spec.rb
@@ -29,9 +29,13 @@
 
     context 'when overriding parameters' do
       before do
-        params.merge!(:auth_cacert => '/tmp/dummy.pem')
+        params.merge!(
+          :auth_cacert        => '/tmp/dummy.pem',
+          :auth_endpoint_type => 'internalURL',
+        )
       end
       it { is_expected.to contain_ceilometer_config('service_credentials/os_cacert').with_value(params[:auth_cacert]) }
+      it { is_expected.to contain_ceilometer_config('service_credentials/os_endpoint_type').with_value(params[:auth_endpoint_type]) }
     end
 
   end