Merge "Consolidate barbican_integration_enabled settings"
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:
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 8029768..96e8f5f 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -1,5 +1,7 @@
parameters:
_param:
+ # Enable barbican integration in other services nova,glance,cinder
+ barbican_integration_enabled: False
# General
cluster_public_protocol: https
cluster_internal_protocol: http
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 8b4f40c..d127aa3 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -54,6 +54,8 @@
region: ${_param:openstack_region}
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/glance/control/single.yml b/glance/control/single.yml
index c9b818d..a22da65 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -31,6 +31,8 @@
registry:
protocol: ${_param:internal_protocol}
show_multiple_locations: True
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
x509:
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: