From d8f0a6b4fd9c3cb10780abcbd9b446c48b08cced Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 Oct 2019 23:14:30 +0100 Subject: [ha] [odl] Patch hostconfig for py3 compat Change-Id: Id6754dec226e75b9ee1e8c19ac04531b9f277e0f Signed-off-by: Alexandru Avadanii --- .../classes/cluster/mcp-odl-ha/openstack/compute.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'mcp/reclass/classes') 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 e873b841a..0846be60d 100644 --- 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 -- cgit 1.2.3-korg