1 files changed, 30 insertions, 5 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 671f6eb07..edaf5190a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -15,19 +15,17 @@ classes:
   - system.ceilometer.client.nova_compute
   - system.ceilometer.client.cinder_volume
   - system.ceilometer.agent.polling.default
-  - system.linux.system.repo.mcp.openstack
+  - service.barbican.client.single
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-noha.openstack_compute_pdf
 parameters:
-  _param:
-    interface_mtu: 9000
-    linux_system_codename: xenial
-    single_address: ${_param:control_address}
   nova:
     compute:
       libvirt_service: libvirtd
       libvirt_bin: /etc/default/libvirtd
       disk_cachemodes: file=directsync,block=none
       vncproxy_url: http://${_param:cluster_vip_address}:6080
+      heal_instance_info_cache_interval: 300
       bind:
         vnc_address: ${_param:single_address}
       network:
@@ -35,11 +33,21 @@ parameters:
         user: neutron
         tenant: service
         password: ${_param:keystone_neutron_password}
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
+      image:
+        verify_glance_signatures: false
+      pkgs:
+        - nova-compute
+        - python3-novaclient
+        - pm-utils
+        - sysfsutils
   neutron:
     compute:
       notification: true
       vlan_aware_vms: true
       root_helper_daemon: false
+      report_interval: 120
       agent_mode: ${_param:neutron_compute_agent_mode}
       message_queue:
         host: ${_param:openstack_control_address}
@@ -47,6 +55,11 @@ parameters:
         host: ${_param:openstack_control_address}
   cinder:
     volume:
+      backend:
+        lvm-driver:
+          # Align system.cinder.volume.backend.lvm and MaaS data
+          volume_group: ${linux:storage:lvm:cinder-vg:name}
+      my_ip: ${_param:single_address}
       database:
         host: ${_param:cluster_local_address}
       identity:
@@ -55,6 +68,13 @@ parameters:
         host: ${_param:cluster_local_address}
       message_queue:
         host: ${_param:cluster_local_address}
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
+      pkgs:
+        - cinder-volume
+      openiscsi_services:
+        - tgt
+        - iscsid
   nfs:
     client:
       mount:
@@ -63,6 +83,11 @@ parameters:
           fstype: nfs
           device: ${_param:openstack_control_address}:/srv/nova/instances
   linux:
+    storage:
+      lvm:
+        # Align with both system.cinder.volume.backend.lvm and MaaS data
+        cinder-vg:
+          name: vgroot
     system:
       kernel:
         sysctl: