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.
Change-Id: Ifcb2c404d700232085ba983dbca3b41dcdaaa43e
Related-Prod: PROD-25026
Related-Prod: PROD-25025
Related-Prod: PROD-25023
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 29a1228..8528bc6 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -55,6 +55,8 @@
host: ${_param:cluster_vip_address}
port: 9292
protocol: ${_param:cluster_internal_protocol}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
engine: rabbitmq
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:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 2e7f8de..a71c1df 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -17,6 +17,8 @@
enabled: ${_param:galera_ssl_enabled}
glance:
host: ${_param:single_address}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
host: ${_param:single_address}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 825a338..ea29a32 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -24,6 +24,8 @@
glance:
host: ${_param:openstack_control_address}
protocol: ${_param:cluster_internal_protocol}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
members: