From 384967bb5d4e30aa4d0cb4f5de3f458d52ab64e0 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 11 Oct 2017 17:06:22 -0400
Subject: [PATCH] Fixes vhostuser port prefix with ODL OVS host config

The incorrect prefix of 'vhu_' was being used for vhost user ports and
it should be simply 'vhu'.

Closes-Bug: 1722917

Change-Id: I960f85845ca5c99aa14a3291b8eea10806081624
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 manifests/plugins/ovs/opendaylight.pp                         | 4 ++--
 ...ix-opendaylight-ovs-vhostuser-prefix-b20936f45a37d644.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-opendaylight-ovs-vhostuser-prefix-b20936f45a37d644.yaml

diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp
index 9f88609d8..71161b8d7 100644
--- a/manifests/plugins/ovs/opendaylight.pp
+++ b/manifests/plugins/ovs/opendaylight.pp
@@ -130,11 +130,11 @@ class neutron::plugins::ovs::opendaylight (
           "vif_details": {\
             "uuid": "${::ovs_uuid}",\
             "has_datapath_type_netdev": true,\
-            "port_prefix": "vhu_",\
+            "port_prefix": "vhu",\
             "vhostuser_socket_dir": "${vhostuser_socket_dir}",\
             "vhostuser_ovs_plug": true,\
             "vhostuser_mode": "${vhostuser_mode}",\
-            "vhostuser_socket": "${vhostuser_socket_dir}/vhu_\$PORT_ID"\
+            "vhostuser_socket": "${vhostuser_socket_dir}/vhu\$PORT_ID"\
           }\
         }],\
         "allowed_network_types": ${json_network_types},\
diff --git a/releasenotes/notes/fix-opendaylight-ovs-vhostuser-prefix-b20936f45a37d644.yaml b/releasenotes/notes/fix-opendaylight-ovs-vhostuser-prefix-b20936f45a37d644.yaml
new file mode 100644
index 000000000..5821b12e8
--- /dev/null
+++ b/releasenotes/notes/fix-opendaylight-ovs-vhostuser-prefix-b20936f45a37d644.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes vhostuser port prefix to be the correct value of 'vhu'.