diff --git a/ceilometer/files/juno/ceilometer-agent.conf.Debian b/ceilometer/files/juno/ceilometer-agent.conf.Debian
index 3e65504..d075c62 100644
--- a/ceilometer/files/juno/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/juno/ceilometer-agent.conf.Debian
@@ -972,8 +972,7 @@
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)
-#os_endpoint_type=publicURL
-os_endpoint_type=internalURL
+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/ceilometer/files/juno/ceilometer-server.conf.Debian b/ceilometer/files/juno/ceilometer-server.conf.Debian
index 51d71a0..6a64874 100644
--- a/ceilometer/files/juno/ceilometer-server.conf.Debian
+++ b/ceilometer/files/juno/ceilometer-server.conf.Debian
@@ -985,7 +985,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/ceilometer/files/kilo/ceilometer-agent.conf.Debian b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
index b4f818b..f9f58e1 100644
--- a/ceilometer/files/kilo/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-agent.conf.Debian
@@ -502,7 +502,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/ceilometer/files/kilo/ceilometer-server.conf.Debian b/ceilometer/files/kilo/ceilometer-server.conf.Debian
index 085ef6b..25f633a 100644
--- a/ceilometer/files/kilo/ceilometer-server.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-server.conf.Debian
@@ -627,7 +627,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/ceilometer/files/liberty/ceilometer-agent.conf.Debian b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
index 9ee6902..fad8adf 100644
--- a/ceilometer/files/liberty/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-agent.conf.Debian
@@ -502,7 +502,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/ceilometer/files/liberty/ceilometer-server.conf.Debian b/ceilometer/files/liberty/ceilometer-server.conf.Debian
index 199d62d..9b364c8 100644
--- a/ceilometer/files/liberty/ceilometer-server.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-server.conf.Debian
@@ -629,7 +629,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/ceilometer/files/mitaka/ceilometer-agent.conf.Debian b/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
index 9ee6902..fad8adf 100644
--- a/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/mitaka/ceilometer-agent.conf.Debian
@@ -502,7 +502,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/ceilometer/files/mitaka/ceilometer-server.conf.Debian b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
index bfd9232..ba2a790 100644
--- a/ceilometer/files/mitaka/ceilometer-server.conf.Debian
+++ b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
@@ -632,7 +632,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/agent/cluster.yml b/metadata/service/agent/cluster.yml
index d1a1444..1e56978 100644
--- a/metadata/service/agent/cluster.yml
+++ b/metadata/service/agent/cluster.yml
@@ -3,6 +3,8 @@
 classes:
 - service.ceilometer.support
 parameters:
+  _param:
+    keystone_ceilometer_endpoint_type: internalURL
   ceilometer:
     agent:
       enabled: true
@@ -17,6 +19,7 @@
         tenant: service
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
+        endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/agent/single.yml b/metadata/service/agent/single.yml
index c2781ad..dfffecf 100644
--- a/metadata/service/agent/single.yml
+++ b/metadata/service/agent/single.yml
@@ -3,6 +3,8 @@
 classes:
 - service.ceilometer.support
 parameters:
+  _param:
+    keystone_ceilometer_endpoint_type: internalURL
   ceilometer:
     agent:
       enabled: true
@@ -17,6 +19,7 @@
         tenant: service
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
+        endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index d2ff0e3..eaedfa1 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -3,6 +3,8 @@
 classes:
 - service.ceilometer.support
 parameters:
+  _param:
+    keystone_ceilometer_endpoint_type: internalURL
   ceilometer:
     server:
       enabled: true
@@ -22,6 +24,7 @@
         tenant: service
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
+        endpoint_type: ${_param:keystone_ceilometer_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 d69f366..f150a61 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,6 +3,8 @@
 classes:
 - service.ceilometer.support
 parameters:
+  _param:
+    keystone_ceilometer_endpoint_type: internalURL
   ceilometer:
     server:
       enabled: true
@@ -21,6 +23,7 @@
         tenant: service
         user: ceilometer
         password: ${_param:keystone_ceilometer_password}
+        endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
       message_queue:
         engine: rabbitmq
         host: ${_param:single_address}
diff --git a/tests/pillar/agent_cluster.sls b/tests/pillar/agent_cluster.sls
index 136de57..9e7ae5c 100644
--- a/tests/pillar/agent_cluster.sls
+++ b/tests/pillar/agent_cluster.sls
@@ -13,6 +13,7 @@
       tenant: service
       user: ceilometer
       password: password
+      endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
diff --git a/tests/pillar/agent_single.sls b/tests/pillar/agent_single.sls
index b893ff3..c93d513 100644
--- a/tests/pillar/agent_single.sls
+++ b/tests/pillar/agent_single.sls
@@ -13,6 +13,7 @@
       tenant: service
       user: ceilometer
       password: password
+      endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 6bbe96f..2cd6eb4 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -18,6 +18,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 e356e9c..1b75393 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -17,6 +17,7 @@
       tenant: service
       user: ceilometer
       password: password
+      endpoint_type: internalURL
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1