From 7c448f39c217b14ccd6eb459e1be8ef3f5b31818 Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Wed, 4 Oct 2017 19:07:58 +0300
Subject: [PATCH] Add Barbican section in Nova and Cinder to use disk
encryption
Change-Id: I5bbd20a390f385a60ff2f330cc8fa7fb1117a42a
Closes-Bug: #1721292
---
ansible/roles/cinder/templates/cinder.conf.j2 | 5 +++++
ansible/roles/nova/templates/nova.conf.j2 | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index c46a52518e..06d9de9552 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -191,3 +191,8 @@ hmac_keys = {{ osprofiler_secret }}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
{% endif %}
+
+{% if enable_barbican | bool %}
+[barbican]
+auth_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+{% endif %}
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index be731a1aea..3279c8821a 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -256,3 +256,8 @@ hmac_keys = {{ osprofiler_secret }}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
{% endif %}
+
+{% if enable_barbican | bool %}
+[barbican]
+auth_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+{% endif %}