Merge "Add rgw_swift_enforce_content_length. * Some tempest tests use accept-ranges header, which is added by this param." into release/2018.11.0
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index b56f46f..c2dfb9e 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -57,6 +57,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 c3115e1..553c081 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -26,6 +26,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 d80c7d0..6ef2274 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
# SSL
ceilometer_agent_ssl_enabled: False
openstack_mysql_x509_enabled: False
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 0c17ac8..7d39d4d 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -52,6 +52,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 3053335..127f687 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -71,6 +71,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 7ba6775..5921ff0 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -70,6 +70,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 330a233..036b4b4 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -62,6 +62,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 5b61f20..5e03214 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -31,6 +31,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: