commit 803d54ffe4f06ac2922d558f66bdb7c985809f28
author Vasyl Saienko <vsaienko@mirantis.com> Mon Nov 19 16:49:27 2018 +0200
committer Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Mon Nov 19 18:18:29 2018 +0000
tree 2b6def9809e3c754fed9e8d4e6f52d35402f4d9a
parent b4f7dd841c74a067bf1e2ffb24d1029ac5c5dbcd

Consolidate barbican_integration_enabled settings

barbican might be enabled in multiple openstack services
 * nova
 * glance
 * cinder

Instead of enabling it on cluster level, move this integration
to system. Use barbican_integration_enabled option for this.

Related-Prod: PROD-25026
Related-Prod: PROD-25025
Related-Prod: PROD-25023

(cherry picked from commit 1cc05dee1232165e5ee9f463302f8c43682de241)

Change-Id: Ifcb2c404d700232085ba983dbca3b41dcdaaa43e

cinder/control/single.yml

diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 6776835..890a5ea 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -30,6 +30,8 @@
       identity:
         protocol: ${_param:internal_protocol}
         region: ${_param:openstack_region}
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         x509: