python-neutron: Fix unescaped quotes in ovsdb agent implementation

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

2 files changed, 31 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron/0001-Escape-quotes-in-ovsdb-agent-implementation.patch b/meta-openstack/recipes-devtools/python/python-neutron/0001-Escape-quotes-in-ovsdb-agent-implementation.patch
new file mode 100644
index 0000000..d734e67
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-neutron/0001-Escape-quotes-in-ovsdb-agent-implementation.patch
@@ -0,0 +1,30 @@
+From 0facdc911f721a6ad86f93f8bad8da210e71709f Mon Sep 17 00:00:00 2001
+From: Adrian Dudau <adrian.dudau@enea.com>
+Date: Thu, 26 Oct 2017 16:35:53 +0200
+Subject: [PATCH] Escape quotes in ovsdb agent implementation
+
+This fixes a parsing error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
+---
+ neutron/agent/ovsdb/impl_vsctl.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/neutron/agent/ovsdb/impl_vsctl.py b/neutron/agent/ovsdb/impl_vsctl.py
+index 51d19cc..1462ed0 100644
+--- a/neutron/agent/ovsdb/impl_vsctl.py
++++ b/neutron/agent/ovsdb/impl_vsctl.py
+@@ -165,7 +165,7 @@ class OvsdbVsctl(ovsdb.API):
+ 
+     def add_manager(self, connection_uri):
+         # This will add a new manager without overriding existing ones.
+-        conn_uri = 'target="%s"' % connection_uri
++        conn_uri = 'target=\"%s\"' % connection_uri
+         args = ['create', 'Manager', conn_uri, '--', 'add', 'Open_vSwitch',
+                 '.', 'manager_options', '@manager']
+         return BaseCommand(self.context, '--id=@manager', args=args)
+-- 
+2.7.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 70b59b1..0133168 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/newton \
            file://dhcp_agent.ini \
            file://metadata_agent.ini \
            file://neutron-dhcp-agent-netns-cleanup.cron \
+           file://0001-Escape-quotes-in-ovsdb-agent-implementation.patch \
           "
 
 # TBD: update or drop