diff --git a/neutron/services/vpn/device_drivers/cisco_ipsec.py b/neutron/services/vpn/device_drivers/cisco_ipsec.py
index 22fe15589..7d73735c1 100644
--- a/neutron/services/vpn/device_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/device_drivers/cisco_ipsec.py
@@ -198,10 +198,8 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
 
         self.service_state = {}
 
-        self.conn.create_consumer(
-            node_topic,
-            self.create_rpc_dispatcher(),
-            fanout=False)
+        self.endpoints = [self]
+        self.conn.create_consumer(node_topic, self.endpoints, fanout=False)
         self.conn.consume_in_threads()
         self.agent_rpc = (
             CiscoCsrIPsecVpnDriverApi(topics.CISCO_IPSEC_DRIVER_TOPIC, '1.0'))
@@ -225,9 +223,6 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
                                                        v['timeout']))
                           for k, v in csrs_found.items()])
 
-    def create_rpc_dispatcher(self):
-        return [self]
-
     def vpnservice_updated(self, context, **kwargs):
         """Handle VPNaaS service driver change notifications."""
         LOG.debug(_("Handling VPN service update notification '%s'"),
diff --git a/neutron/services/vpn/device_drivers/ipsec.py b/neutron/services/vpn/device_drivers/ipsec.py
index 2ed7c08a6..aef47919c 100644
--- a/neutron/services/vpn/device_drivers/ipsec.py
+++ b/neutron/services/vpn/device_drivers/ipsec.py
@@ -504,10 +504,8 @@ class IPsecDriver(device_drivers.DeviceDriver):
         self.processes = {}
         self.process_status_cache = {}
 
-        self.conn.create_consumer(
-            node_topic,
-            self.create_rpc_dispatcher(),
-            fanout=False)
+        self.endpoints = [self]
+        self.conn.create_consumer(node_topic, self.endpoints, fanout=False)
         self.conn.consume_in_threads()
         self.agent_rpc = IPsecVpnDriverApi(topics.IPSEC_DRIVER_TOPIC, '1.0')
         self.process_status_cache_check = loopingcall.FixedIntervalLoopingCall(
@@ -515,9 +513,6 @@ class IPsecDriver(device_drivers.DeviceDriver):
         self.process_status_cache_check.start(
             interval=self.conf.ipsec.ipsec_status_check_interval)
 
-    def create_rpc_dispatcher(self):
-        return [self]
-
     def _update_nat(self, vpnservice, func):
         """Setting up nat rule in iptables.
 
diff --git a/neutron/services/vpn/service_drivers/cisco_ipsec.py b/neutron/services/vpn/service_drivers/cisco_ipsec.py
index 4c4bd7a05..ed34f41ff 100644
--- a/neutron/services/vpn/service_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/service_drivers/cisco_ipsec.py
@@ -53,9 +53,6 @@ class CiscoCsrIPsecVpnDriverCallBack(rpc_compat.RpcCallback):
         super(CiscoCsrIPsecVpnDriverCallBack, self).__init__()
         self.driver = driver
 
-    def create_rpc_dispatcher(self):
-        return [self]
-
     def get_vpn_services_on_host(self, context, host=None):
         """Retuns info on the vpnservices on the host."""
         plugin = self.driver.service_plugin
@@ -88,12 +85,10 @@ class CiscoCsrIPsecVPNDriver(service_drivers.VpnDriver):
 
     def __init__(self, service_plugin):
         super(CiscoCsrIPsecVPNDriver, self).__init__(service_plugin)
-        self.callbacks = CiscoCsrIPsecVpnDriverCallBack(self)
+        self.endpoints = [CiscoCsrIPsecVpnDriverCallBack(self)]
         self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
-            topics.CISCO_IPSEC_DRIVER_TOPIC,
-            self.callbacks.create_rpc_dispatcher(),
-            fanout=False)
+            topics.CISCO_IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False)
         self.conn.consume_in_threads()
         self.agent_rpc = CiscoCsrIPsecVpnAgentApi(
             topics.CISCO_IPSEC_AGENT_TOPIC, BASE_IPSEC_VERSION)
diff --git a/neutron/services/vpn/service_drivers/ipsec.py b/neutron/services/vpn/service_drivers/ipsec.py
index 662662044..be6aa9e26 100644
--- a/neutron/services/vpn/service_drivers/ipsec.py
+++ b/neutron/services/vpn/service_drivers/ipsec.py
@@ -40,9 +40,6 @@ class IPsecVpnDriverCallBack(rpc_compat.RpcCallback):
         super(IPsecVpnDriverCallBack, self).__init__()
         self.driver = driver
 
-    def create_rpc_dispatcher(self):
-        return [self]
-
     def get_vpn_services_on_host(self, context, host=None):
         """Returns the vpnservices on the host."""
         plugin = self.driver.service_plugin
@@ -73,12 +70,10 @@ class IPsecVPNDriver(service_drivers.VpnDriver):
 
     def __init__(self, service_plugin):
         super(IPsecVPNDriver, self).__init__(service_plugin)
-        self.callbacks = IPsecVpnDriverCallBack(self)
+        self.endpoints = [IPsecVpnDriverCallBack(self)]
         self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
-            topics.IPSEC_DRIVER_TOPIC,
-            self.callbacks.create_rpc_dispatcher(),
-            fanout=False)
+            topics.IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False)
         self.conn.consume_in_threads()
         self.agent_rpc = IPsecVpnAgentApi(
             topics.IPSEC_AGENT_TOPIC, BASE_IPSEC_VERSION)