X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-ha%2Fopenstack_compute.yml;h=bed9bf05c8afd384bce2ebdcd8824240fc79b6df;hb=refs%2Fchanges%2F69%2F67169%2F2;hp=c7c6f2fabbd2e13f9e25a42a85abc12a4dbb6d27;hpb=c875da0f72a06e05bdf76f1f2ab9e1a7136b8ae3;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 c7c6f2fab..bed9bf05c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.repo.mcp.mirror.v1.openstack
-  - system.linux.system.repo.glusterfs
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
   - system.nova.compute.nfv.hugepages
@@ -17,13 +16,15 @@ classes:
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
   - system.ceilometer.agent.polling.default
+  - service.barbican.client.cluster
+  - cluster.mcp-common-ha.glusterfs_repo
   - 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}
@@ -31,12 +32,9 @@ parameters:
     cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
     cluster_node03_address: ${_param:openstack_control_node03_address}
     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    interface_mtu: 1500
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
     linux_system_codename: xenial
-    single_address: ${_param:control_address}
-    glusterfs_version: '3.13'
   glusterfs:
     client:
       volumes:
@@ -47,12 +45,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:
@@ -67,11 +68,21 @@ parameters:
         boot_options:
           - spectre_v2=off
           - nopti
+          - nospec_store_bypass_disable
+          - noibrs
+          - noibpb
   neutron:
     gateway:
       vlan_aware_vms: true
       root_helper_daemon: false
+      dhcp_lease_duration: 3600
+      report_interval: 120
   nova:
     compute:
       disk_cachemodes: file=directsync,block=none
       preallocate_images: space
+      heal_instance_info_cache_interval: 300
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
+      image:
+        verify_glance_signatures: false