Merge "Enable barbican itegration on compute nodes"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_compute.yml

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index c793f97..76573c0 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -17,13 +17,14 @@ classes:
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
   - system.ceilometer.agent.polling.default
+  - service.barbican.client.cluster
   - cluster.mcp-common-ha.openstack_compute_pdf
-  - cluster.mcp-common-ha.include.maas_proxy
-  - cluster.mcp-common-ha.include.lab_proxy_pdf
+  - cluster.all-mcp-arch-common.opnfv.maas_proxy
+  - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:control_address}
+    cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
     cluster_node01_address: ${_param:openstack_control_node01_address}
     cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
@@ -46,10 +47,15 @@ parameters:
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   cinder:
     volume:
+      my_ip: ${_param:single_address}
       backend:
         lvm-driver:
           # Align system.cinder.volume.backend.lvm and MaaS data
           volume_group: ${linux:storage:lvm:cinder-vg:name}
+      database:
+        connection_recycle_time: ${_param:db_connection_recycle_time}
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
   linux:
     storage:
       lvm:
@@ -71,3 +77,6 @@ parameters:
   nova:
     compute:
       disk_cachemodes: file=directsync,block=none
+      preallocate_images: space
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}