diff --git a/aodh/files/mitaka/aodh.conf.Debian b/aodh/files/mitaka/aodh.conf.Debian
index 6e3f8a9..4b7745b 100644
--- a/aodh/files/mitaka/aodh.conf.Debian
+++ b/aodh/files/mitaka/aodh.conf.Debian
@@ -865,7 +865,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-#os_endpoint_type=publicURL
+os_endpoint_type={{ server.identity.get('endpoint_type', 'publicURL') }}
 
 # Disables X.509 certificate validation when an SSL connection
 # to Identity Service is established. (boolean value)
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index 05ef9b1..00bb18b 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -3,6 +3,8 @@
 classes:
 - service.aodh.support
 parameters:
+  _param:
+    keystone_aodh_endpoint_type: internalURL
   aodh:
     server:
       enabled: true
@@ -28,6 +30,7 @@
         tenant: service
         user: aodh
         password: ${_param:keystone_aodh_password}
+        endpoint_type: ${_param:keystone_aodh_endpoint_type}
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 7b5e146..8cd1b5b 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,6 +3,8 @@
 classes:
 - service.aodh.support
 parameters:
+  _param:
+    keystone_aodh_endpoint_type: internalURL
   aodh:
     server:
       enabled: true
@@ -25,6 +27,7 @@
         tenant: service
         user: aodh
         password: ${_param:keystone_aodh_password}
+        endpoint_type: ${_param:keystone_aodh_endpoint_type}
       message_queue:
         engine: rabbit
         host: ${_param:single_address}
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 52c527f..e543e5b 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -15,6 +15,7 @@
       tenant: service
       user: ceilometer
       password: password
+      endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
       members:
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 5e2cc95..395a110 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -15,6 +15,7 @@
       tenant: service
       user: ceilometer
       password: password
+      endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1