From 8b7a5e4d0e7e0c7951f81cd6720757789543579a Mon Sep 17 00:00:00 2001
From: James Denton <james.denton@outlook.com>
Date: Wed, 13 Oct 2021 11:02:54 -0500
Subject: [PATCH] Deprecate OVN-related haproxy configuration

With the implementation of proper cluster support, the haproxy configuration
for OVN-related services are no longer necessary. This patch marks the
endpoints absent for eventual removal.

Change-Id: Icb78797ec5057414c9d6e99d9b6a04200ee4b0a9
---
 inventory/group_vars/haproxy/haproxy.yml      | 39 +++----------------
 ...ate-ovn-haproxy-vips-061652cd82342819.yaml |  6 +++
 2 files changed, 12 insertions(+), 33 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-ovn-haproxy-vips-061652cd82342819.yaml

diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml
index f128e63fca..1d65ccca3c 100644
--- a/inventory/group_vars/haproxy/haproxy.yml
+++ b/inventory/group_vars/haproxy/haproxy.yml
@@ -387,44 +387,20 @@ haproxy_opendaylight_websocket_service:
   haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}"
   haproxy_service_enabled: "{{ neutron_plugin_type == 'ml2.opendaylight' }}"
 
+# TODO(jamesdenton): Remove that in Z release
 haproxy_ovn_northbound_service:
   haproxy_service_name: neutron_ovn_northd_northbound
-  haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}" # list expected
-  haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
-  haproxy_port: 6641
-  haproxy_bind: "{{ [internal_lb_vip_address] }}"
-  haproxy_balance_type: tcp
-  haproxy_timeout_client: 90m
-  haproxy_timeout_server: 90m
-  haproxy_backend_options:
-    - tcpka
-  haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"
+  state: absent
 
+# TODO(jamesdenton): Remove that in Z release
 haproxy_ovn_southbound_service:
   haproxy_service_name: neutron_ovn_northd_southbound
-  haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
-  haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
-  haproxy_port: 6642
-  haproxy_bind: "{{ [internal_lb_vip_address] }}"
-  haproxy_balance_type: tcp
-  haproxy_timeout_client: 90m
-  haproxy_timeout_server: 90m
-  haproxy_backend_options:
-    - tcpka
-  haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"
+  state: absent
 
+# TODO(jamesdenton): Remove that in Z release
 haproxy_ovn_ovsdb_service:
   haproxy_service_name: neutron_ovn_ovsdb_server
-  haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
-  haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
-  haproxy_port: 6640
-  haproxy_bind: "{{ [internal_lb_vip_address] }}"
-  haproxy_balance_type: tcp
-  haproxy_timeout_client: 90m
-  haproxy_timeout_server: 90m
-  haproxy_backend_options:
-    - tcpka
-  haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"
+  state: absent
 
 # TODO(noonedeadpunk): Remove that in Y release
 haproxy_panko_api_service:
@@ -584,9 +560,6 @@ haproxy_default_services:
   - service: "{{ haproxy_octavia_service }}"
   - service: "{{ haproxy_opendaylight_neutron_service }}"
   - service: "{{ haproxy_opendaylight_websocket_service }}"
-  - service: "{{ haproxy_ovn_northbound_service }}"
-  - service: "{{ haproxy_ovn_southbound_service }}"
-  - service: "{{ haproxy_ovn_ovsdb_service }}"
   - service: "{{ haproxy_panko_api_service }}"
   - service: "{{ haproxy_placement_service }}"
   - service: "{{ haproxy_rabbitmq_service }}"
diff --git a/releasenotes/notes/deprecate-ovn-haproxy-vips-061652cd82342819.yaml b/releasenotes/notes/deprecate-ovn-haproxy-vips-061652cd82342819.yaml
new file mode 100644
index 0000000000..cfb46b3657
--- /dev/null
+++ b/releasenotes/notes/deprecate-ovn-haproxy-vips-061652cd82342819.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    OVN-related HAProxy configuration is deprecated and has been
+    replaced with built-in clustering functionality. OVN-related
+    endpoints will be completely removed in the Z release.