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/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 84e00fd..fdb8bcb 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -70,6 +70,8 @@
password: ${_param:keystone_nova_password}
tenant: service
protocol: ${_param:cluster_internal_protocol}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index a44fe23..f14192c 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -69,6 +69,8 @@
tenant: service
protocol: ${_param:cluster_internal_protocol}
region: ${_param:openstack_region}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
engine: rabbitmq
host: ${_param:control_address}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 04ba5ee..08bbf07 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -61,6 +61,8 @@
password: ${_param:keystone_nova_password}
tenant: service
protocol: ${_param:cluster_internal_protocol}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
engine: rabbitmq
port: ${_param:openstack_rabbitmq_port}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 4f56665..a97a033 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -29,6 +29,8 @@
region: ${_param:openstack_region}
glance:
protocol: ${_param:cluster_internal_protocol}
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
x509: