X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-ha%2Fopenstack_compute.yml;h=76573c0eab602ffb2a0d900f05cd569fe78d71d7;hb=143bf770cf104daaf8d457a3de294d6acb33f9cf;hp=c793f97599d87638c2200ae9c14a519649b1b38b;hpb=bf341b7e0d7e423044827f379e4b180e9dc897a1;p=fuel.git

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 c793f9759..76573c0ea 100644
--- 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}