From 2e58ae335ffd8a58499342df00683d53acb26928 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 6 Mar 2018 16:19:22 +0400 Subject: Mend opendaylight settings * class including order (default was used) * disable root_helper_daemon (incompatible with UCA) * turn off websocket for pseudo agent updates Change-Id: I4d7971d393da184bdd55f65b4d3fd8d9e898543f Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml | 2 +- mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'mcp/reclass') diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml index d1166b941..6c3e0d04c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml @@ -7,10 +7,10 @@ ############################################################################## --- classes: + - service.neutron.gateway.opendaylight.single - cluster.mcp-pike-common-ha.openstack_compute - cluster.mcp-pike-odl-ha.openstack.compute_pdf - cluster.mcp-pike-odl-ha.infra - - service.neutron.gateway.opendaylight.single parameters: neutron: gateway: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml index a6c8bc1df..c50f5b2cc 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml @@ -11,3 +11,8 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_control - cluster.mcp-pike-odl-ha.infra +parameters: + neutron: + server: + backend: + enable_websocket: false -- cgit 1.2.3-korg