From 7c42204a659c2d7fc6b9f62a9fe1ceed9f177a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Mon, 24 Aug 2020 10:01:27 +0200
Subject: [PATCH] Drop option http-tunnel for neutron-server

Change-Id: I6910bcdb122e42337d7938405f792fa0fe32e49b
Closes-Bug: #1892686
---
 ansible/roles/neutron/defaults/main.yml              |  2 --
 releasenotes/notes/bug-1892686-409fef7c100ab67f.yaml | 11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-1892686-409fef7c100ab67f.yaml

diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 76bc243080..b37d01e90a 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -17,8 +17,6 @@ neutron_services:
         external: false
         port: "{{ neutron_server_port }}"
         listen_port: "{{ neutron_server_listen_port }}"
-        frontend_http_extra:
-          - "option http-tunnel"
       neutron_server_external:
         enabled: "{{ enable_neutron }}"
         mode: "http"
diff --git a/releasenotes/notes/bug-1892686-409fef7c100ab67f.yaml b/releasenotes/notes/bug-1892686-409fef7c100ab67f.yaml
new file mode 100644
index 0000000000..8e2d5ad13e
--- /dev/null
+++ b/releasenotes/notes/bug-1892686-409fef7c100ab67f.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    No longer uses ``option http-tunnel`` for Neutron Server in HAProxy.
+    Please amend manually if you relied on the quirky behaviour.
+    `LP#1892686 <https://launchpad.net/bugs/1892686>`__
+fixes:
+  - |
+    No longer uses ``option http-tunnel`` for Neutron Server in HAProxy.
+    This mode was long not recommended and recently deprecated entirely.
+    `LP#1892686 <https://launchpad.net/bugs/1892686>`__