From 0c8eca1990726b3dfcf0572aedda5cf3f62a1f49 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 (cherry picked from commit 0a8568d9f170d6c3b42d2dd35db440b4251f9a5d) --- .../classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 | 2 -- mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml | 4 ---- .../classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml | 2 -- mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml | 4 ---- mcp/reclass/classes/system | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) (limited to 'mcp/reclass/classes') 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: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml index 8cd1c236b..8854fc2bf 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml @@ -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-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml index 8798589c3..5bc0f2444 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml @@ -36,10 +36,6 @@ parameters: host: ${_param:opendaylight_service_host} port: 8282 params: ${_param:haproxy_check} - neutron: - server: - backend: - enable_websocket: false keystone: server: openrc_extra: diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index d9eb865a7..198b5b745 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit d9eb865a72f54f14b2ec1de1a70c9e7c645d5feb +Subproject commit 198b5b7459c9f602ded773e966888705d866f6dd -- cgit 1.2.3-korg