[ha] [odl] Patch hostconfig for py3 compat

[fuel.git] / mcp / reclass / classes / cluster / mcp-odl-ha / openstack / compute.yml

diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml
index e873b84..0846be6 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml
@@ -12,6 +12,10 @@ classes:
   - cluster.mcp-odl-ha.openstack.compute_pdf
   - cluster.mcp-odl-ha.infra
 parameters:
+  nova:
+    compute:
+      libvirt_service: libvirtd
+      libvirt_bin: /etc/default/libvirtd
   neutron:
     gateway:
       agent_mode: ${_param:neutron_gateway_agent_mode}
@@ -19,3 +23,16 @@ parameters:
         ovsdb_connection: tcp:127.0.0.1:6640
       opendaylight:
         ovsdb_server_iface: ptcp:6640:127.0.0.1
+  linux:
+    system:
+      file:
+        /var/tmp/odl_hostconfig.patch:
+          contents: |
+            420c420
+            <                 if datapath_types.find(datapath_type) >= 0)
+            ---
+            >                 if datapath_type in datapath_types)
+            460c460
+            <         return subprocess.check_output(command_line).strip()  # nosec
+            ---
+            >         return subprocess.check_output(command_line).strip().decode()  # nosec