Merge "Enforce log hints in neutron.services.metering"

diff --cc neutron/services/metering/agents/metering_agent.py
index 168af42cb79dd4ad931c7170f73c3fb9459acd94,d4229d5833f7d17d8012e49e19da8956e8334814..75eca17ccc15323f8fffe336c94899038412a3d7
--- 1/neutron/services/metering/agents/metering_agent.py
--- 2/neutron/services/metering/agents/metering_agent.py
+++ b/neutron/services/metering/agents/metering_agent.py
@@@ -49,11 -52,12 +50,11 @@@ class MeteringPluginRpc(object)
  
      def _get_sync_data_metering(self, context):
          try:
 -            return self.call(context,
 -                             self.make_msg('get_sync_data_metering',
 -                                           host=self.host),
 -                             topic=topics.METERING_PLUGIN)
 +            cctxt = self.client.prepare()
 +            return cctxt.call(context, 'get_sync_data_metering',
 +                              host=self.host)
          except Exception:
-             LOG.exception(_("Failed synchronizing routers"))
+             LOG.exception(_LE("Failed synchronizing routers"))
  
  
  class MeteringAgent(MeteringPluginRpc, manager.Manager):