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 <mpolenchuk@mirantis.com>

10 files changed, 2 insertions, 188 deletions

diff --git a/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch b/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch
deleted file mode 100644
index f3ed7847d..000000000
--- a/mcp/patches/0001-Filter-out-OpenDaylight-client-on-computes.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Mon, 12 Mar 2018 16:32:50 +0400
-Subject: [PATCH] Filter out OpenDaylight client on computes
-
-OpenDaylight uses pseudo agents to manage network ports,
-therefore detach unwanted ovs agent & etc. from compute state.
-Also swap the set-manager target with tunnel_ip/provider_mappings
-settings since ovs host config should be in place before manager setup.
-
-Change-Id: I07cd760fdb4ce84aba21450af9246c8c9128118f
-
-diff --git a/neutron/compute.sls b/neutron/compute.sls
-index 418282d..e83a5b7 100644
---- a/neutron/compute.sls
-+++ b/neutron/compute.sls
-@@ -2,6 +2,36 @@
- {%- if compute.enabled %}
-
- {% if compute.backend.engine == "ml2" %}
-+
-+{% if compute.get('dhcp_agent_enabled', False) %}
-+neutron_dhcp_agent_packages:
-+  pkg.installed:
-+  - names:
-+    - neutron-dhcp-agent
-+
-+neutron_dhcp_agent:
-+  service.running:
-+    - enable: true
-+    - names:
-+      - neutron-dhcp-agent
-+    - watch:
-+      - file: /etc/neutron/dhcp_agent.ini
-+    - require:
-+      - pkg: neutron_dhcp_agent_packages
-+
-+/etc/neutron/dhcp_agent.ini:
-+  file.managed:
-+  - source: salt://neutron/files/{{ compute.version }}/dhcp_agent.ini
-+  - template: jinja
-+  - require:
-+    - pkg: neutron_dhcp_agent_packages
-+
-+{% endif %}
-+
-+{%- if compute.opendaylight is defined %}
-+include:
-+  - .opendaylight.client
-+{%- else %}
- neutron_compute_packages:
-   pkg.installed:
-   - names: {{ compute.pkgs }}
-@@ -53,31 +83,6 @@ neutron_sriov_service:
-
- {% endif %}
-
--{% if compute.get('dhcp_agent_enabled', False) %}
--neutron_dhcp_agent_packages:
--  pkg.installed:
--  - names:
--    - neutron-dhcp-agent
--
--neutron_dhcp_agent:
--  service.running:
--    - enable: true
--    - names:
--      - neutron-dhcp-agent
--    - watch:
--      - file: /etc/neutron/dhcp_agent.ini
--    - require:
--      - pkg: neutron_dhcp_agent_packages
--
--/etc/neutron/dhcp_agent.ini:
--  file.managed:
--  - source: salt://neutron/files/{{ compute.version }}/dhcp_agent.ini
--  - template: jinja
--  - require:
--    - pkg: neutron_dhcp_agent_packages
--
--{% endif %}
--
- {% if compute.dvr %}
-
- {%- if fwaas.get('enabled', False) %}
-@@ -243,10 +248,7 @@ rabbitmq_ca_neutron_compute:
- {%- endif %}
- {%- endif %}
-
--{%- if compute.opendaylight is defined %}
--include:
--  - .opendaylight.client
--{%- endif %}
-+{%- endif %}{# !OpenDaylight #}
-
- {%- elif compute.backend.engine == "ovn" %}
-
-diff --git a/neutron/opendaylight/client.sls b/neutron/opendaylight/client.sls
-index 57e6bcc..bb0cf65 100644
---- a/neutron/opendaylight/client.sls
-+++ b/neutron/opendaylight/client.sls
-@@ -9,21 +9,16 @@ python-networking-odl:
-
- {%- if not grains.get('noservices', False) %}
-
--ovs_set_manager:
--  cmd.run:
--  - name: 'ovs-vsctl set-manager {{ neutron.opendaylight.ovsdb_server_iface }} {{ neutron.opendaylight.ovsdb_odl_iface }}'
--  - unless: 'ovs-vsctl get-manager | fgrep -x {{ neutron.opendaylight.ovsdb_odl_iface }}'
--
- ovs_set_tunnel_endpoint:
-   cmd.run:
-   - name: 'ovs-vsctl set Open_vSwitch . other_config:local_ip={{ neutron.opendaylight.tunnel_ip }}'
--  - unless: 'ovs-vsctl get Open_vSwitch . other_config | fgrep local_ip="{{ neutron.opendaylight.tunnel_ip }}"'
-+  - unless: 'ovs-vsctl get Open_vSwitch . other_config | fgrep -q local_ip=\"{{ neutron.opendaylight.tunnel_ip }}\"'
-
- {%- if neutron.opendaylight.provider_mappings is defined %}
- ovs_set_provider_mappings:
-   cmd.run:
-   - name: 'ovs-vsctl set Open_vSwitch . other_config:provider_mappings={{ neutron.opendaylight.provider_mappings }}'
--  - unless: 'ovs-vsctl get Open_vSwitch . other_config | fgrep provider_mappings="{{ neutron.opendaylight.provider_mappings }}"'
-+  - unless: 'ovs-vsctl get Open_vSwitch . other_config | fgrep -q provider_mappings=\"{{ neutron.opendaylight.provider_mappings }}\"'
- {%- endif %}
-
- neutron_odl_ovs_hostconfig:
-@@ -32,4 +27,9 @@ neutron_odl_ovs_hostconfig:
-   - require:
-     - pkg: python-networking-odl
-
-+ovs_set_manager:
-+  cmd.run:
-+  - name: 'ovs-vsctl set-manager {{ neutron.opendaylight.ovsdb_server_iface }} {{ neutron.opendaylight.ovsdb_odl_iface }}'
-+  - unless: 'ovs-vsctl get-manager | fgrep -qx {{ neutron.opendaylight.ovsdb_odl_iface }}'
-+
- {%- endif %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index b650ec87b..dfb0df773 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -5,7 +5,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-/usr/share/salt-formulas/env: 0001-Filter-out-OpenDaylight-client-on-computes.patch
 /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch
 /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch
 /usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch
diff --git a/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch
index b22951a8f..514ea59e4 100644
--- a/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
+++ b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch
@@ -20,7 +20,7 @@ Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/keystone/client/single.yml b/keystone/client/single.yml
-index a79ed7e..86b4e09 100644
+index a79ed7ec..86b4e09e 100644
 --- a/keystone/client/single.yml
 +++ b/keystone/client/single.yml
 @@ -4,7 +4,7 @@ classes:
diff --git a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch
deleted file mode 100644
index ab818df70..000000000
--- a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 6 Mar 2018 22:40:06 +0100
-Subject: [PATCH] ceilometer:server:publisher: Add 'enabled' default
-
-Fixes: #306
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- ceilometer/server/cluster.yml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
-index 11488fb..2d19e31 100644
---- a/ceilometer/server/cluster.yml
-+++ b/ceilometer/server/cluster.yml
-@@ -14,6 +14,7 @@ parameters:
-       ttl: 86400
-       publisher:
-         default:
-+          enabled: false
-       bind:
-         host: ${_param:cluster_local_address}
-         port: 8777
diff --git a/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch
index d0ddc58c2..00b4cf34b 100644
--- a/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch
+++ b/mcp/patches/reclass-system-salt-model/0002-Revert-Admin-endpoint-for-keystone-v3.patch
@@ -24,7 +24,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
-index 5138c4f..9b69294 100644
+index 5138c4fc..9b69294b 100644
 --- a/keystone/client/service/keystone3.yml
 +++ b/keystone/client/service/keystone3.yml
 @@ -22,5 +22,5 @@ parameters:
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
-Subproject d9eb865a72f54f14b2ec1de1a70c9e7c645d5fe
+Subproject 198b5b7459c9f602ded773e966888705d866f6d