diff --git a/watcher/conf/neutron_client.py b/watcher/conf/neutron_client.py
index b8af6cdca..4a8888dbb 100644
--- a/watcher/conf/neutron_client.py
+++ b/watcher/conf/neutron_client.py
@@ -26,10 +26,10 @@ NEUTRON_CLIENT_OPTS = [
                default='2.0',
                help='Version of Neutron API to use in neutronclient.'),
     cfg.StrOpt('endpoint_type',
-               default='internalURL',
+               default='publicURL',
                help='Type of endpoint to use in neutronclient.'
                     '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 3f55e7352..174a85370 100755
--- a/watcher/tests/common/test_clients.py
+++ b/watcher/tests/common/test_clients.py
@@ -329,12 +329,12 @@ class TestClients(base.TestCase):
     @mock.patch.object(clients.OpenStackClients, 'session')
     def test_clients_neutron_diff_endpoint(self, mock_session):
         '''neutronclient currently only has one version (v2)'''
-        CONF.set_override('endpoint_type', 'publicURL',
+        CONF.set_override('endpoint_type', 'internalURL',
                           group='neutron_client')
         osc = clients.OpenStackClients()
         osc._neutron = None
         osc.neutron()
-        self.assertEqual('publicURL', osc.neutron().httpclient.interface)
+        self.assertEqual('internalURL', osc.neutron().httpclient.interface)
 
     @mock.patch.object(clients.OpenStackClients, 'session')
     def test_clients_neutron_cached(self, mock_session):