From 19564b1533533880bdeda092324e70dc081d9ac4 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Wed, 15 Apr 2020 12:09:37 +0200
Subject: [PATCH] Deprecate rabbitmq_hipe_compile

Erlang 22.x dropped support for HiPE so use of "rabbitmq_hipe_compile"
is deprecated.

Change-Id: I8e0173c7aa6204e5b4c60dafbb8b464482cae90b
---
 ansible/group_vars/all.yml                                   | 1 -
 ansible/roles/rabbitmq/templates/rabbitmq.conf.j2            | 3 ---
 .../deprecate-rabbitmq-hipe-compile-e76ad1d597129236.yaml    | 5 +++++
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-rabbitmq-hipe-compile-e76ad1d597129236.yaml

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index d31fc2e106..c618197438 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -730,7 +730,6 @@ osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_
 ####################
 # RabbitMQ options
 ####################
-rabbitmq_hipe_compile: "no"
 rabbitmq_user: "openstack"
 rabbitmq_monitoring_user: ""
 outward_rabbitmq_user: "openstack"
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.conf.j2
index 31983f4f7b..f897499dac 100644
--- a/ansible/roles/rabbitmq/templates/rabbitmq.conf.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq.conf.j2
@@ -1,9 +1,6 @@
 # NOTE(yoctozepto): rabbitmq uses the raw format (e.g. fd::) of IPv6 address;
 # despite specifying port via colon, the url format (e.g. [fd::]) is not accepted
 listeners.tcp.1 = {{ api_interface_address }}:{{ role_rabbitmq_port }}
-{% if rabbitmq_hipe_compile|bool %}
-hipe_compile = true
-{% endif %}
 {# NOTE: to avoid split-brain #}
 cluster_partition_handling = pause_minority
 
diff --git a/releasenotes/notes/deprecate-rabbitmq-hipe-compile-e76ad1d597129236.yaml b/releasenotes/notes/deprecate-rabbitmq-hipe-compile-e76ad1d597129236.yaml
new file mode 100644
index 0000000000..d7b1804002
--- /dev/null
+++ b/releasenotes/notes/deprecate-rabbitmq-hipe-compile-e76ad1d597129236.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Erlang 22.x dropped support for HiPE so the ``rabbitmq_hipe_compile``
+    variable has been removed.