From 7c200db70ee071bdfc1c77216ece434bc8816328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 25 Feb 2020 21:30:56 +0100
Subject: [PATCH] Fix client TLS in neutron-metadata-agent
Backport to: Train.
Change-Id: Ide96ea43739d47e623026f0aecd4163f3a2abe7f
Closes-bug: #1864615
---
ansible/roles/neutron/templates/metadata_agent.ini.j2 | 2 +-
releasenotes/notes/bug-1864615-84b4b58ea57ecfe9.yaml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/bug-1864615-84b4b58ea57ecfe9.yaml
diff --git a/ansible/roles/neutron/templates/metadata_agent.ini.j2 b/ansible/roles/neutron/templates/metadata_agent.ini.j2
index 981d86c451..1092545f13 100644
--- a/ansible/roles/neutron/templates/metadata_agent.ini.j2
+++ b/ansible/roles/neutron/templates/metadata_agent.ini.j2
@@ -1,6 +1,6 @@
# metadata_agent.ini
[DEFAULT]
nova_metadata_host = {{ nova_internal_fqdn }}
-
nova_metadata_port = {{ nova_metadata_port }}
metadata_proxy_shared_secret = {{ metadata_secret }}
+nova_metadata_protocol = {{ internal_protocol }}
diff --git a/releasenotes/notes/bug-1864615-84b4b58ea57ecfe9.yaml b/releasenotes/notes/bug-1864615-84b4b58ea57ecfe9.yaml
new file mode 100644
index 0000000000..50ccb634f0
--- /dev/null
+++ b/releasenotes/notes/bug-1864615-84b4b58ea57ecfe9.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fix protocol used by ``neutron-metadata-agent`` to connect to Nova metadata
+ service. This possibly affected internal TLS setup.
+ Fixes `LP#1864615 <https://bugs.launchpad.net/kolla-ansible/+bug/1864615>`__