--- neutron/services/bgp/driver/ryu/driver.py.orig	2016-06-15 16:50:22.769477324 -0300
+++ neutron/services/bgp/driver/ryu/driver.py	2016-06-15 16:52:10.144634977 -0300
@@ -16,6 +16,7 @@
 from oslo_log import log as logging
 from ryu.services.protocols.bgp import bgpspeaker
 from ryu.services.protocols.bgp.rtconf.neighbors import CONNECT_MODE_ACTIVE
+import six

 from neutron.services.bgp.driver import base
 from neutron.services.bgp.driver import exceptions as bgp_driver_exc
@@ -115,6 +116,9 @@
             raise bgp_driver_exc.BgpSpeakerNotAdded(local_as=speaker_as,
                                                     rtid=self.routerid)

+        if isinstance(password, six.text_type):
+            password = password.encode('utf-8')
+
         # Validate peer_ip and peer_as.
         utils.validate_as_num('remote_as', peer_as)
         utils.validate_string(peer_ip)