diff --git a/watcher/conf/cinder_client.py b/watcher/conf/cinder_client.py
index ddd86b4f0..687c4ce6c 100644
--- a/watcher/conf/cinder_client.py
+++ b/watcher/conf/cinder_client.py
@@ -26,10 +26,10 @@ CINDER_CLIENT_OPTS = [
                default='3',
                help='Version of Cinder API to use in cinderclient.'),
     cfg.StrOpt('endpoint_type',
-               default='internalURL',
+               default='publicURL',
                help='Type of endpoint to use in cinderclient.'
                     'Supported values: internalURL, publicURL, adminURL'
-                    'The default is internalURL.')]
+                    'The default is publicURL.')]
 
 
 def register_opts(conf):
diff --git a/watcher/tests/common/test_clients.py b/watcher/tests/common/test_clients.py
index 813eec712..1349779dc 100755
--- a/watcher/tests/common/test_clients.py
+++ b/watcher/tests/common/test_clients.py
@@ -239,11 +239,12 @@ class TestClients(base.TestCase):
 
     @mock.patch.object(clients.OpenStackClients, 'session')
     def test_clients_cinder_diff_endpoint(self, mock_session):
-        CONF.set_override('endpoint_type', 'publicURL', group='cinder_client')
+        CONF.set_override('endpoint_type',
+                          'internalURL', group='cinder_client')
         osc = clients.OpenStackClients()
         osc._cinder = None
         osc.cinder()
-        self.assertEqual('publicURL', osc.cinder().client.interface)
+        self.assertEqual('internalURL', osc.cinder().client.interface)
 
     @mock.patch.object(clients.OpenStackClients, 'session')
     def test_clients_cinder_cached(self, mock_session):