Merge "Fixes the OvsVhostuserMode heat parameter"

puppet/services/opendaylight-ovs.yaml

@@ -50,11 +50,12 @@ parameters:
     tags:
       - role_specific
   OvsVhostuserMode:
-    description: Specify the mode for OVS with vhostuser port creation.  In
-                 client mode, the hypervisor will be responsible for creating
-                 vhostuser sockets.  In server mode, OVS will create them.
+    description: Specify the mode for QEMU with vhostuser port creation.  In
+                 client mode, openvswitch will be responsible for creating
+                 vhostuser sockets.  In server mode, the hypervisor will create
+                 them.  Note, 'client' mode is deprecated.
     type: string
-    default: "client"
+    default: "server"
     constraints:
       - allowed_values: [ 'client', 'server' ]
     tags:
@@ -323,4 +324,4 @@ outputs:
             - service: ovs
               network: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
               type: node
-          - null
+          - null

releasenotes/notes/fix-odl-ovs-vhostusermode-7bc2b64fd2676ca2.yaml

@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    Fixes default of vhostuser_mode in ODL-OVS to be server, and clarifies
+    the configuration parameter. See
+    https://bugs.launchpad.net/tripleo/+bug/1762473
+deprecations:
+  - |
+    Using 'client' for OvsVhostuserMode parameter. See 'vhost-user' section
+    at http://docs.openvswitch.org/en/latest/topics/dpdk/vhost-user/