From 0a8568d9f170d6c3b42d2dd35db440b4251f9a5d Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 11 Apr 2018 16:50:28 +0400 Subject: Clean up opendaylight configuration * remove client patch (has been merged to upstream) * websocket now is disabled by default * purge deprecated/unneeded features (odl-mdsal-apidocs, odl-dlux-all) Change-Id: Id247a3c74e66730049bfeafc4a5164aad0d9b662 Signed-off-by: Michael Polenchuk --- .../classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 | 2 -- mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml | 4 ---- 2 files changed, 6 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 index 90efb945f..a5db82387 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 @@ -26,7 +26,5 @@ parameters: odl_default: - odl-restconf-all - odl-aaa-authn - - odl-dlux-all - - odl-mdsal-apidocs netvirt: - odl-netvirt-openstack 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 0820d8bf5..e907e3d4c 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 @@ -12,10 +12,6 @@ classes: - cluster.mcp-pike-common-ha.openstack_control - cluster.mcp-pike-odl-ha.infra parameters: - neutron: - server: - backend: - enable_websocket: false keystone: server: openrc_extra: -- cgit 1.2.3-korg